Rebuild translations again.

17 files changed, 6153 insertions, 8212 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3a7d370bc..0e509ee33 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,21 +8,21 @@ src/commandhandler.h
 src/game.cpp
 src/gui/beingpopup.cpp
 src/gui/botcheckerwindow.cpp
-src/gui/buy.cpp
-src/gui/buysell.cpp
+src/gui/buydialog.cpp
+src/gui/buyselldialog.cpp
 src/gui/changeemaildialog.cpp
 src/gui/changepassworddialog.cpp
 src/gui/charcreatedialog.cpp
 src/gui/charselectdialog.cpp
-src/gui/chat.cpp
+src/gui/chatwindow.cpp
 src/gui/confirmdialog.cpp
 src/gui/connectiondialog.cpp
 src/gui/debugwindow.cpp
 src/gui/editdialog.cpp
 src/gui/equipmentwindow.cpp
-src/gui/help.cpp
+src/gui/helpwindow.cpp
 src/gui/inventorywindow.cpp
-src/gui/itemamount.cpp
+src/gui/itemamountwindow.cpp
 src/gui/itempopup.cpp
 src/gui/killstats.cpp
 src/gui/login.cpp
diff --git a/po/da.po b/po/da.po
index 47cd0f342..48440afb2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2009-07-25 17:33+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -60,10 +60,10 @@ msgstr "Opretter forbindelse til kort-serveren..."
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -101,561 +101,167 @@ msgstr "Frameld"
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ugyldig opdaterings host: "
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Ukendt kommando"
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "--Hjælp--"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Vis denne hjælpebesked"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Vis dine koordinater på kortet"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Vis antallet af spillere der er online"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Vis en beskrivelse af dig"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Sletter text i chat-vinduet."
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Send en privat besked til en spiller"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Samme som msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > Samme som msg"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Starter en privat samtale med en spiller"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > Samme som query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:322
-#, fuzzy
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/close > Lukker hviskesamtale-tabben"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr ""
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr ""
-
-#: src/commandhandler.cpp:325
-msgid "/disregard > Disregard a player"
-msgstr ""
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr ""
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Vis alle offentlige chat-kanaler"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Deltag i en chat-kanal"
-
-#: src/commandhandler.cpp:331
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Opret en ny gruppe"
-
-#: src/commandhandler.cpp:332
-#, fuzzy
-msgid "/createguild > Create a new guild"
-msgstr "/create > Opret en ny gruppe"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Inviter en spiller til din gruppe"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Afgør om et tryk på retur-knappen skal aktivere chatvinduet."
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Vis en liste af alle spillere på serveren (Sendes til chat-loggen "
-"hvis den er slået til)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Send en besked til allle spillere (Kun for GM)"
-
-#: src/commandhandler.cpp:342
-#, fuzzy
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/close > Lukker hviskesamtale-tabben"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr ""
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr ""
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr ""
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr ""
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr ""
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr ""
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr ""
-
-#: src/commandhandler.cpp:354
-#, fuzzy
-msgid "/mail > Send offline message to player"
-msgstr "/msg > Send en privat besked til en spiller"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "/help <kommando>   > Vis en detaljeret beskrivelse af <kommando>"
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Kommando: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Kommando: /help <kommando>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Denne kommando viser hjælp for <kommando>"
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Kommando: /announce <besked>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** kun tilgængelig for en GM ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Kommando: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Denne kommando rydder chat loggen"
-
-#: src/commandhandler.cpp:386
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Kommand: /item <regel>"
-
-#: src/commandhandler.cpp:387
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr ""
-"Denne kommando viser det antal af online brugere, der er online  lige nu."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Kommando: : /join <chat-kanal>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Denne kommando tilmelder dig til <chat-kanal>"
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Hvis <chat-kanal> ikke eksisterer, så bliver den oprettet."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Kommando: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Denne kommando viser en liste over alle chat-kanaler."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Kommando: /me <besked>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Denne kommando fortæller andre at du er (eller gør) <besked>"
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Kommando: /msg <spiller> <besked>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Kommando: /whisper <spiller> <besked>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Kommando: /w <spiller> <besked>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Denne kommando sender <besked> til <spiller>"
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Hvis <spilller>  (altså spillerens navn) indeholder mellemrum, så kan du "
-"sætter gåseøjne (\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Kommando: /query <spilller>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Kommando: /q <spiller>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Denne kommando opretter en ny tab med privat samtale mellem dig og <nick>."
-
-#: src/commandhandler.cpp:424
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Kommando: /w <spiller> <besked>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:427
-#, fuzzy
-msgid "Command: /away"
-msgstr "Kommando: /who"
-
-#: src/commandhandler.cpp:428
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Denne kommando sætter kanalens emne til <besked>"
-
-#: src/commandhandler.cpp:432
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Kommando: /create <gruppe>"
-
-#: src/commandhandler.cpp:433
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Disse kommandoer opretter en gruppe ved navn <gruppe>"
-
-#: src/commandhandler.cpp:437
-#, fuzzy
-msgid "Command: /createguild <name>"
-msgstr "Kommando: /create <gruppe>"
-
-#: src/commandhandler.cpp:438
-#, fuzzy
-msgid "This command creates a new guild called <name>."
-msgstr "Disse kommandoer opretter en gruppe ved navn <gruppe>"
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr ""
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Denne kommando inviterer <spiller> til din gruppe."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Kommando: /present"
-
-#: src/commandhandler.cpp:450
-#, fuzzy
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"Denne kommando finder en liste over brugere, der er inden for en "
-"lytteradius, og sender listen til enten record loggen, hvis du optager, "
-"ellers er det chat loggen."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Kommando /toggle <tilstand>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Denne kommando bestemmer om retur, skal bruges til at fokusere på chat "
-"loggen, ellerom chat om chat loggen, automatisk skal slå fra."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<tilstand> kan være en ud af \"1\", \"yes\", \"true\" for at slå fokusering "
-"af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
-"chat vindue fra."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Kommando: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "Denne kommando viser fokusering af chat vinduets status."
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Kommand: /item <regel>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "kommando: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Denne kommando viser det nuværende bane navn."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Kommando: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr ""
-"Denne kommando viser det antal af online brugere, der er online  lige nu."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Skriv /help for at få en liste med kommandoer"
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "du kan ikke sende en hviskebesked uden tekst!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Du glemte at skrive et navn på dit party."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Du glemte at skrive et navn på dit party."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "Retur bringer focus på chatten."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "Besked lukker chat."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "Enter bringer nu focus på chatten."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Besked lukker nu chat."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 #, fuzzy
 msgid "friend"
 msgstr "Ven"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 #, fuzzy
 msgid "disregarded"
 msgstr "Se bort fra"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 #, fuzzy
 msgid "neutral"
 msgstr "Neutral"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Du har nu oprettet gruppen."
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Du har nu oprettet gruppen."
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -757,12 +363,12 @@ msgstr ""
 msgid "Reset"
 msgstr "Nulstil"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Køb"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -770,50 +376,52 @@ msgstr "Pris: %s / Total: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Maks"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "butik"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Sælg"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Fortryd"
 
@@ -969,7 +577,7 @@ msgstr "Frameld"
 msgid "Change Email"
 msgstr "Skift e-mail adresse"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -989,90 +597,90 @@ msgstr "Niveau: %d"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 #, fuzzy
 msgid "default"
 msgstr "Standard"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr ""
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 #, fuzzy
 msgid "red"
 msgstr "Ven"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 #, fuzzy
 msgid "green"
 msgstr "Grøn: "
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 #, fuzzy
 msgid "blue"
 msgstr "Blå: "
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr ""
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 #, fuzzy
 msgid "yellow"
 msgstr "lav"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 #, fuzzy
 msgid "pink"
 msgstr "Hyperlink"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr ""
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr ""
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 #, fuzzy
 msgid "brown"
 msgstr "Kastevåben"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 #, fuzzy
 msgid "rainbow 1"
 msgstr "Regnbuefarvet"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 #, fuzzy
 msgid "rainbow 2"
 msgstr "Regnbuefarvet"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 #, fuzzy
 msgid "rainbow 3"
 msgstr "Regnbuefarvet"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Der er %d spillere til stede"
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til %s: %s"
@@ -1207,7 +815,7 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1224,11 +832,11 @@ msgstr "Udstyr"
 msgid "Unequip"
 msgstr "Tag af"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Luk"
@@ -1315,39 +923,39 @@ msgstr "Hent fra lager"
 msgid "Drop"
 msgstr "Smid"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Vælg hvor mange genstande du vil smide."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Vælg hvor mange genstande du vil lagre"
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Vælg hvor mange genstande du vil opdele."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 #, fuzzy
 msgid "Unknown."
 msgstr "Ukendt fejl"
@@ -1494,7 +1102,7 @@ msgstr "Luk"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Log Ind"
 
@@ -1516,11 +1124,11 @@ msgstr "Husk Brugernavn"
 msgid "Update:"
 msgstr ""
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
@@ -2015,56 +1623,56 @@ msgstr "Vælg din server"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:229
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:246
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:232
-msgid "Use same ip for game sub servers"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Connect"
 msgstr "Opretter forbindelse..."
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 #, fuzzy
 msgid "Custom Server"
 msgstr "Brugerdefineret cursor"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Skriv både adressen og porten på serveren."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Venter på serveren"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3585,34 +3193,34 @@ msgstr "Du har ikke penge nok."
 msgid "Name: %s"
 msgstr "Navn: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Updatere..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Spil"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1  Opdateringsprocessen er ikke færdiggjort"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det er varmt anbefalet at"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  du prøver igen senere"
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Udført"
 
@@ -3858,6 +3466,13 @@ msgstr "Kommando: /op <navn>"
 msgid "This command makes <nick> a channel operator."
 msgstr "Denne kommando gør <navn> til operator"
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+"Hvis <spilller>  (altså spillerens navn) indeholder mellemrum, så kan du "
+"sætter gåseøjne (\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3926,6 +3541,11 @@ msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 "Denne kommando viser det antal af online brugere, der er online  lige nu."
 
+#: src/gui/widgets/whispertab.cpp:128
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Kommand: /item <regel>"
+
 #: src/gui/widgets/whispertab.cpp:129
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
@@ -4479,7 +4099,7 @@ msgstr[1] "Du samlede %s [@@%d|%s@@] op."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 #, fuzzy
 msgid "You see "
 msgstr "Du får %s."
@@ -5109,20 +4729,20 @@ msgstr "Beskeden kunne ikke sendes. Modtageren er ikke logget på."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 #, fuzzy
 msgid "MVP player."
 msgstr "Bruger"
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 #, fuzzy
 msgid "MVP player: "
 msgstr "Bruger"
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Serveren understøtter ikke kanaler!"
 
@@ -5415,6 +5035,10 @@ msgstr "/item > Vis/ret hvordan gruppen deler fundne tin"
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/item > Vis/ret hvordan partyet deler exp"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Denne kommando inviterer <spiller> til din gruppe."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Denne kommando får dig til at forlade din gruppe"
@@ -5899,6 +5523,245 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Ukendt genstand"
 
+#~ msgid "-- Help --"
+#~ msgstr "--Hjælp--"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Vis denne hjælpebesked"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Vis dine koordinater på kortet"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Vis antallet af spillere der er online"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Vis en beskrivelse af dig"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Sletter text i chat-vinduet."
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Send en privat besked til en spiller"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > Samme som msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > Samme som msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr "/query > Starter en privat samtale med en spiller"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > Samme som query"
+
+#, fuzzy
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/close > Lukker hviskesamtale-tabben"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Vis alle offentlige chat-kanaler"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Deltag i en chat-kanal"
+
+#, fuzzy
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/create > Opret en ny gruppe"
+
+#, fuzzy
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/create > Opret en ny gruppe"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Inviter en spiller til din gruppe"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr ""
+#~ "/toggle > Afgør om et tryk på retur-knappen skal aktivere chatvinduet."
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Vis en liste af alle spillere på serveren (Sendes til chat-"
+#~ "loggen hvis den er slået til)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Send en besked til allle spillere (Kun for GM)"
+
+#, fuzzy
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/close > Lukker hviskesamtale-tabben"
+
+#, fuzzy
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/msg > Send en privat besked til en spiller"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "/help <kommando>   > Vis en detaljeret beskrivelse af <kommando>"
+
+#~ msgid "Command: /help"
+#~ msgstr "Kommando: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Kommando: /help <kommando>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Denne kommando viser hjælp for <kommando>"
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Kommando: /announce <besked>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** kun tilgængelig for en GM ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Kommando: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Denne kommando rydder chat loggen"
+
+#, fuzzy
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Kommand: /item <regel>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr ""
+#~ "Denne kommando viser det antal af online brugere, der er online  lige nu."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Kommando: : /join <chat-kanal>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Denne kommando tilmelder dig til <chat-kanal>"
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Hvis <chat-kanal> ikke eksisterer, så bliver den oprettet."
+
+#~ msgid "Command: /list"
+#~ msgstr "Kommando: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Denne kommando viser en liste over alle chat-kanaler."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Kommando: /me <besked>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Denne kommando fortæller andre at du er (eller gør) <besked>"
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Kommando: /msg <spiller> <besked>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Kommando: /whisper <spiller> <besked>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Kommando: /w <spiller> <besked>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Denne kommando sender <besked> til <spiller>"
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Kommando: /query <spilller>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Kommando: /q <spiller>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Denne kommando opretter en ny tab med privat samtale mellem dig og <nick>."
+
+#, fuzzy
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Kommando: /w <spiller> <besked>"
+
+#, fuzzy
+#~ msgid "Command: /away"
+#~ msgstr "Kommando: /who"
+
+#, fuzzy
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Denne kommando sætter kanalens emne til <besked>"
+
+#, fuzzy
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Kommando: /create <gruppe>"
+
+#, fuzzy
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Disse kommandoer opretter en gruppe ved navn <gruppe>"
+
+#, fuzzy
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Kommando: /create <gruppe>"
+
+#, fuzzy
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Disse kommandoer opretter en gruppe ved navn <gruppe>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Kommando: /present"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "Denne kommando finder en liste over brugere, der er inden for en "
+#~ "lytteradius, og sender listen til enten record loggen, hvis du optager, "
+#~ "ellers er det chat loggen."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Kommando /toggle <tilstand>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr ""
+#~ "Denne kommando bestemmer om retur, skal bruges til at fokusere på chat "
+#~ "loggen, ellerom chat om chat loggen, automatisk skal slå fra."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<tilstand> kan være en ud af \"1\", \"yes\", \"true\" for at slå "
+#~ "fokusering af chat vindue til, eller \"0\", \"no\", \"false\" for at slå "
+#~ "fokusering af chat vindue fra."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Kommando: /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "Denne kommando viser fokusering af chat vinduets status."
+
+#~ msgid "Command: /where"
+#~ msgstr "kommando: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Denne kommando viser det nuværende bane navn."
+
+#~ msgid "Command: /who"
+#~ msgstr "Kommando: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr ""
+#~ "Denne kommando viser det antal af online brugere, der er online  lige nu."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Skriv /help for at få en liste med kommandoer"
+
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Partikeldetaljer"
diff --git a/po/de.po b/po/de.po
index 4b83ddd95..88e01fd07 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\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"
@@ -79,10 +79,10 @@ msgstr "Verbinde mit [Charakterserver]..."
 msgid "Changing game servers"
 msgstr "Wechsle den Server"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -119,436 +119,34 @@ msgstr "Abmelden"
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: "
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, fuzzy, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "-- Hilfe --"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > diese Hilfe anzeigen"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Zeige den Namen der aktuellen Karte"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Erzähle etwas über Dich"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Löscht den Inhalt dieses Fensters"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Ersatz für msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > Ersatz für msg"
-
-#: src/commandhandler.cpp:313
-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:315
-msgid "/q > Alias of query"
-msgstr "/q > Ersatz für query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-"/away > Teilt den anderen flüsternden Spielern deine Abwesenheit von der "
-"Tastatur mit."
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Ignoriere einen Spieler"
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Ignorierung eines Spielers aufheben"
-
-#: src/commandhandler.cpp:322
-#, fuzzy
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/ignore > Anderen Spieler ignorieren"
-
-#: src/commandhandler.cpp:323
-#, fuzzy
-msgid "/erase > Erase a player"
-msgstr "/ignore > Ignoriere einen Spieler"
-
-#: src/commandhandler.cpp:324
-#, fuzzy
-msgid "/befriend > Be friend a player"
-msgstr "/ignore > Ignoriere einen Spieler"
-
-#: src/commandhandler.cpp:325
-#, fuzzy
-msgid "/disregard > Disregard a player"
-msgstr "/ignore > Ignoriere einen Spieler"
-
-#: src/commandhandler.cpp:326
-#, fuzzy
-msgid "/neutral > Neutral a player"
-msgstr "/ignore > Ignoriere einen Spieler"
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Zeige alle öffentlichen Kanäle"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Trete einem Kanal bei oder erstelle einen neuen Kanal"
-
-#: src/commandhandler.cpp:331
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Erstelle eine neue Party"
-
-#: src/commandhandler.cpp:332
-#, fuzzy
-msgid "/createguild > Create a new guild"
-msgstr "/create > Erstelle eine neue Party"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Lade einen Benutzer zu deiner Party ein"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Entscheide, ob <return> den Chat-Dialog schließt"
-
-#: src/commandhandler.cpp:337
-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:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globale Ansage (Nur von GM's nutzbar)"
-
-#: src/commandhandler.cpp:342
-#, fuzzy
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/close > Schließe einen privaten Tab"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr ""
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr ""
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr ""
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr ""
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr ""
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr ""
-
-#: src/commandhandler.cpp:353
-#, fuzzy
-msgid "/heal > Heal player"
-msgstr "/ignore > Ignoriere einen Spieler"
-
-#: src/commandhandler.cpp:354
-#, fuzzy
-msgid "/mail > Send offline message to player"
-msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Für mehr Informationen, gib /help <Befehl> ein."
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Befehl: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Dieser Befehl zeigt alle möglichen Befehle an"
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Befehl: /help <Befehl>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Dieser Befehl zeigt die Hilfe für <Befehl>."
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Befehl: /announce <Nachricht>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** Nur für GMs verfügbar ***"
-
-#: src/commandhandler.cpp:376
-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:381
-msgid "Command: /clear"
-msgstr "Befehl: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
-
-#: src/commandhandler.cpp:386
-msgid "Command: /ignore <player>"
-msgstr "Befehl: /item <Wert>"
-
-#: src/commandhandler.cpp:387
-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:392
-msgid "Command: /join <channel>"
-msgstr "Befehl: /join <Kanal>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Dieser Befehl lässt dich dem Kanal <Kanal> beitreten."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Falls Kanal <Kanal> nicht existiert, wird er erstellt."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Befehl: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Dieser Befehl zeigt eine liste aller Kanäle an."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Befehl: /me <Nachricht>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Dieser Befehl zeigt eine Aktion <Nachricht> an."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Befehl: /msg <Name> <Nachricht>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Befehl: /whisper <Name> <Nachricht>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Befehl: /w <Name> <Nachricht>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Dieser Befehl sendet den Text <Nachricht> an den Spieler <Name>."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-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:417
-msgid "Command: /query <nick>"
-msgstr "Befehl: /query <Name>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Befehl: /q <Name>"
-
-#: src/commandhandler.cpp:419
-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:424
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Befehl: /w <Name> <Nachricht>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr "Dieser Befehl teilt deine Abwesenheit und deren angegebenen Grund mit."
-
-#: src/commandhandler.cpp:427
-#, fuzzy
-msgid "Command: /away"
-msgstr "Befehl: /who"
-
-#: src/commandhandler.cpp:428
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Dieser Befehl setzt das Theme auf <Thema>."
-
-#: src/commandhandler.cpp:432
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Befehl: /create <Party-Name>"
-
-#: src/commandhandler.cpp:433
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
-
-#: src/commandhandler.cpp:437
-#, fuzzy
-msgid "Command: /createguild <name>"
-msgstr "Befehl: /create <Party-Name>"
-
-#: src/commandhandler.cpp:438
-#, fuzzy
-msgid "This command creates a new guild called <name>."
-msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Befehl: /party <Name>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-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:449
-msgid "Command: /present"
-msgstr "Befehl: /present"
-
-#: src/commandhandler.cpp:450
-#, fuzzy
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"Dieser Befehl erstellt eine Liste mit allen Spielern in Hörreichweite und "
-"sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im "
-"Chatfenster an."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Befehl: /toggle <Status>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Mit diesem Befehl kannst Du entscheiden, ob die Chatzeile schließt, sobald "
-"eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste erneut "
-"gedrückt wurde."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<Status> \"1\",\"yes\",\"true\" aktiviert das Schließen durch Enter,  \"0\","
-"\"no\",\"false\" deaktiviert es."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Befehl: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "Dieser Befehl zeigt, wann sich die Chatzeile schließt."
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Befehl: /item <Wert>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-"Dieser Befehl hebt die Ignorierung des angegeben ignorierten Spieler auf."
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Befehl: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Dieser Befehl zeigt den Namen der aktuellen Karte an."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Befehl: /who"
-
-#: src/commandhandler.cpp:479
-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:485
-msgid "Type /help for a list of commands."
-msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -557,135 +155,135 @@ msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
 "einer, oder der Spieler bist du."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "Enter-Taste schließt Chatzeile."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "Nachricht schließt Chatzeile."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "Jetzt schließt Enter die Chatzeile."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Jetzt schließt jede Nachricht die Chatzeile."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 msgid "friend"
 msgstr "Freund"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 #, fuzzy
 msgid "disregarded"
 msgstr "Unbeachtet"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 #, fuzzy
 msgid "neutral"
 msgstr "Neutral"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Spieler wird bereits ignoriert!"
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Party erfolgreich erstellt."
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Spieler wird bereits ignoriert!"
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Party erfolgreich erstellt."
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -788,12 +386,12 @@ msgstr ""
 msgid "Reset"
 msgstr "Zurücksetzten"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Kaufen"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -801,50 +399,52 @@ msgstr "Preis: %s / Gesamt: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr "-"
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Max"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Geschäft"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Verkaufen"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -994,7 +594,7 @@ msgstr "Abmelden"
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -1013,86 +613,86 @@ msgstr "Stufe: %d"
 msgid "(empty)"
 msgstr "(leer)"
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 msgid "default"
 msgstr "Standard"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr ""
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 #, fuzzy
 msgid "red"
 msgstr "Freund"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 #, fuzzy
 msgid "green"
 msgstr "Grün: "
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 msgid "blue"
 msgstr ""
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr ""
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 msgid "pink"
 msgstr ""
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr ""
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr ""
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 #, fuzzy
 msgid "brown"
 msgstr "geworfen"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 #, fuzzy
 msgid "rainbow 1"
 msgstr "Regenbogen"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 #, fuzzy
 msgid "rainbow 2"
 msgstr "Regenbogen"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 #, fuzzy
 msgid "rainbow 3"
 msgstr "Regenbogen"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
@@ -1227,7 +827,7 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1244,11 +844,11 @@ msgstr "Ausrüstung"
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Schließen"
@@ -1334,39 +934,39 @@ msgstr "Abholen"
 msgid "Drop"
 msgstr "Wegwerfen"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Wähle aus, wie viele Gegenstände du einlagern möchtest."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Wähle aus, wie viele Gegenstände du wieder haben möchtest."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Wähle aus, wie viel Gegenstände Du aufteilen möchtest."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 #, fuzzy
 msgid "Unknown."
 msgstr "Unbekannter Gegenstand"
@@ -1513,7 +1113,7 @@ msgstr "Schließen"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Anmelden"
 
@@ -1535,11 +1135,11 @@ msgstr "Benutzername merken"
 msgid "Update:"
 msgstr ""
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 msgid "Change Server"
 msgstr "Wechsle den Server"
 
@@ -2018,55 +1618,55 @@ msgstr "Wähle deinen Server"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:229
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:246
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:232
-msgid "Use same ip for game sub servers"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 msgid "Connect"
 msgstr "Verbinde..."
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 #, fuzzy
 msgid "Custom Server"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 #, fuzzy
 msgid "Error retreiving server list!"
 msgstr "Fehler beim empfangen der Serverliste: %s\n"
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -3582,34 +3182,34 @@ msgstr "Du hast nicht genügend Geld."
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Aktualisiere..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Los!"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 es später erneut zu versuchen."
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Fertig"
 
@@ -3857,6 +3457,13 @@ msgstr "Befehl: /op <Name>"
 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:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+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/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3923,6 +3530,11 @@ msgstr "Befehl: /item"
 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:128
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Befehl: /item <Wert>"
+
 #: src/gui/widgets/whispertab.cpp:129
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
@@ -4477,7 +4089,7 @@ msgstr[1] "Du hast %s [@@%d|%s@@] aufgehoben."
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 #, fuzzy
 msgid "You see "
 msgstr "Du erhältst %s."
@@ -5088,19 +4700,19 @@ msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 msgid "MVP player."
 msgstr "Spieler"
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 #, fuzzy
 msgid "MVP player: "
 msgstr "Spieler"
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Kanäle werden nicht unterstützt!"
 
@@ -5385,6 +4997,10 @@ msgstr ""
 "/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der "
 "Party"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Dieser Befehl lässt Dich die Party verlassen"
@@ -5874,6 +5490,290 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
+#~ msgid "-- Help --"
+#~ msgstr "-- Hilfe --"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > diese Hilfe anzeigen"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Zeige den Namen der aktuellen Karte"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Erzähle etwas über Dich"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Löscht den Inhalt dieses Fensters"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > Ersatz für msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > Ersatz für msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr ""
+#~ "/query > Öffnet einen Tab für private Nachrichten mit einem anderen "
+#~ "Benutzer"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > Ersatz für query"
+
+#~ msgid "/away > Tell the other whispering players you're away from keyboard."
+#~ msgstr ""
+#~ "/away > Teilt den anderen flüsternden Spielern deine Abwesenheit von der "
+#~ "Tastatur mit."
+
+#~ msgid "/ignore > ignore a player"
+#~ msgstr "/ignore > Ignoriere einen Spieler"
+
+#~ msgid "/unignore > stop ignoring a player"
+#~ msgstr "/unignore > Ignorierung eines Spielers aufheben"
+
+#, fuzzy
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/ignore > Anderen Spieler ignorieren"
+
+#, fuzzy
+#~ msgid "/erase > Erase a player"
+#~ msgstr "/ignore > Ignoriere einen Spieler"
+
+#, fuzzy
+#~ msgid "/befriend > Be friend a player"
+#~ msgstr "/ignore > Ignoriere einen Spieler"
+
+#, fuzzy
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "/ignore > Ignoriere einen Spieler"
+
+#, fuzzy
+#~ msgid "/neutral > Neutral a player"
+#~ msgstr "/ignore > Ignoriere einen Spieler"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Zeige alle öffentlichen Kanäle"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Trete einem Kanal bei oder erstelle einen neuen Kanal"
+
+#, fuzzy
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/create > Erstelle eine neue Party"
+
+#, fuzzy
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/create > Erstelle eine neue Party"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Lade einen Benutzer zu deiner Party ein"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr "/toggle > Entscheide, ob <return> den Chat-Dialog schließt"
+
+#~ 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)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Globale Ansage (Nur von GM's nutzbar)"
+
+#, fuzzy
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/close > Schließe einen privaten Tab"
+
+#, fuzzy
+#~ msgid "/heal > Heal player"
+#~ msgstr "/ignore > Ignoriere einen Spieler"
+
+#, fuzzy
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Für mehr Informationen, gib /help <Befehl> ein."
+
+#~ msgid "Command: /help"
+#~ msgstr "Befehl: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Dieser Befehl zeigt alle möglichen Befehle an"
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Befehl: /help <Befehl>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Dieser Befehl zeigt die Hilfe für <Befehl>."
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Befehl: /announce <Nachricht>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** Nur für GMs verfügbar ***"
+
+#~ 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."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Befehl: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
+
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Befehl: /item <Wert>"
+
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr ""
+#~ "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Befehl: /join <Kanal>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Dieser Befehl lässt dich dem Kanal <Kanal> beitreten."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Falls Kanal <Kanal> nicht existiert, wird er erstellt."
+
+#~ msgid "Command: /list"
+#~ msgstr "Befehl: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Dieser Befehl zeigt eine liste aller Kanäle an."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Befehl: /me <Nachricht>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Dieser Befehl zeigt eine Aktion <Nachricht> an."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Befehl: /msg <Name> <Nachricht>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Befehl: /whisper <Name> <Nachricht>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Befehl: /w <Name> <Nachricht>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Dieser Befehl sendet den Text <Nachricht> an den Spieler <Name>."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Befehl: /query <Name>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Befehl: /q <Name>"
+
+#~ 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>."
+
+#, fuzzy
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Befehl: /w <Name> <Nachricht>"
+
+#~ msgid "This command tells you're away from keyboard with the given reason."
+#~ msgstr ""
+#~ "Dieser Befehl teilt deine Abwesenheit und deren angegebenen Grund mit."
+
+#, fuzzy
+#~ msgid "Command: /away"
+#~ msgstr "Befehl: /who"
+
+#, fuzzy
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Dieser Befehl setzt das Theme auf <Thema>."
+
+#, fuzzy
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Befehl: /create <Party-Name>"
+
+#, fuzzy
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
+
+#, fuzzy
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Befehl: /create <Party-Name>"
+
+#, fuzzy
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Befehl: /party <Name>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Befehl: /present"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "Dieser Befehl erstellt eine Liste mit allen Spielern in Hörreichweite und "
+#~ "sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im "
+#~ "Chatfenster an."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Befehl: /toggle <Status>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr ""
+#~ "Mit diesem Befehl kannst Du entscheiden, ob die Chatzeile schließt, "
+#~ "sobald eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste "
+#~ "erneut gedrückt wurde."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<Status> \"1\",\"yes\",\"true\" aktiviert das Schließen durch Enter,  "
+#~ "\"0\",\"no\",\"false\" deaktiviert es."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Befehl: /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "Dieser Befehl zeigt, wann sich die Chatzeile schließt."
+
+#~ msgid ""
+#~ "This command stops ignoring the given player if they are being ignored"
+#~ msgstr ""
+#~ "Dieser Befehl hebt die Ignorierung des angegeben ignorierten Spieler auf."
+
+#~ msgid "Command: /where"
+#~ msgstr "Befehl: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Dieser Befehl zeigt den Namen der aktuellen Karte an."
+
+#~ msgid "Command: /who"
+#~ msgstr "Befehl: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr ""
+#~ "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
+
 #~ msgid "/record > Start recording the chat to an external file"
 #~ msgstr "/record > Starte die Aufzeichnung des Chats in eine Datei"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 7d1a22af9..fa15a7f4e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2010-03-04 21:01+0000\n"
 "Last-Translator: issyl0 <isabell121@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -60,10 +60,10 @@ msgstr "Connecting to map server..."
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -102,420 +102,34 @@ msgstr "Unregister"
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalid update host: "
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Unknown command."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "-- Help --"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Display this help"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Display map name"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Display number of online users"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Tell something about yourself"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Clears this window"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Send a private message to a user"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias of msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > Alias of msg"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Makes a tab for private messages with another user"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > Alias of query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:322
-#, fuzzy
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/close > Close the whisper tab"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr ""
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr ""
-
-#: src/commandhandler.cpp:325
-#, fuzzy
-msgid "/disregard > Disregard a player"
-msgstr "@@disregard|Disregard %s@@"
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr ""
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Display all public channels"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Join or create a channel"
-
-#: src/commandhandler.cpp:331
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Create a new party"
-
-#: src/commandhandler.cpp:332
-#, fuzzy
-msgid "/createguild > Create a new guild"
-msgstr "/create > Create a new party"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Invite a user to party"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Determine whether <return> toggles the chat log"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > Get list of players present (sent to chat log, if logging)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Global announcement (GM only)"
-
-#: src/commandhandler.cpp:342
-#, fuzzy
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/close > Close the whisper tab"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr ""
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr ""
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr ""
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr ""
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr ""
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr ""
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr ""
-
-#: src/commandhandler.cpp:354
-#, fuzzy
-msgid "/mail > Send offline message to player"
-msgstr "/msg > Send a private message to a user"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "For more information, type /help <command>."
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Command: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "This command displays a list of all commands available."
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Command: /help <command>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "This command displays help on <command>."
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Command: /announce <msg>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** only available to a GM ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "This command sends the message <msg> to all players currently online."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Command: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "This command clears the chat log of previous chat."
-
-#: src/commandhandler.cpp:386
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Command: /item <policy>"
-
-#: src/commandhandler.cpp:387
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "This command displays the number of players currently online."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Command: /join <channel>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "This command makes you enter <channel>."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "If <channel> doesn't exist, it's created."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Command: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "This command shows a list of all channels."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Command: /me <message>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "This command tell others you are (doing) <msg>."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Command: /msg <nick> <message>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Command: /whisper <nick> <message>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Command: /w <nick> <message>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "This command sends the text <message> to <nick>."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "If the <nick> has spaces in it, enclose it in double quotes (\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Command: /query <nick>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Command: /q <nick>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr "This command tries to make a tab for whispers between you and <nick>."
-
-#: src/commandhandler.cpp:424
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Command: /w <nick> <message>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:427
-#, fuzzy
-msgid "Command: /away"
-msgstr "Command: /who"
-
-#: src/commandhandler.cpp:428
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "This command sets the topic to <message>."
-
-#: src/commandhandler.cpp:432
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Command: /create <party-name>"
-
-#: src/commandhandler.cpp:433
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "These commands create a new party called <party-name>."
-
-#: src/commandhandler.cpp:437
-#, fuzzy
-msgid "Command: /createguild <name>"
-msgstr "Command: /create <party-name>"
-
-#: src/commandhandler.cpp:438
-#, fuzzy
-msgid "This command creates a new guild called <name>."
-msgstr "These commands create a new party called <party-name>."
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Command: /party <nick>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "This command invites <nick> to party with you."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Command: /present"
-
-#: src/commandhandler.cpp:450
-#, fuzzy
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Command: /toggle <state>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Command: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "This command displays the return toggle status."
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Command: /item <policy>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Command: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "This command displays the name of the current map."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Command: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "This command displays the number of players currently online."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Type /help for a list of commands."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Cannot send empty whispers!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -524,133 +138,133 @@ msgstr ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Requesting to join channel %s."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Party name is missing."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Party name is missing."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "Return toggles chat."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "Message closes chat."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "Return now toggles chat."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Message now closes chat."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 #, fuzzy
 msgid "friend"
 msgstr "Friend"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 #, fuzzy
 msgid "disregarded"
 msgstr "Disregarded"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 #, fuzzy
 msgid "neutral"
 msgstr "Neutral"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Party successfully created."
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Party successfully created."
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -752,12 +366,12 @@ msgstr ""
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Buy"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -765,50 +379,52 @@ msgstr "Price: %s / Total: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Exit"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Max"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Shop"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Sell"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -964,7 +580,7 @@ msgstr "Unregister"
 msgid "Change Email"
 msgstr "Change Email Address"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -984,90 +600,90 @@ msgstr "Level: %d"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 #, fuzzy
 msgid "default"
 msgstr "Default"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr ""
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 #, fuzzy
 msgid "red"
 msgstr "Friend"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 #, fuzzy
 msgid "green"
 msgstr "Green: "
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 #, fuzzy
 msgid "blue"
 msgstr "Blue: "
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr ""
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 #, fuzzy
 msgid "yellow"
 msgstr "low"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 #, fuzzy
 msgid "pink"
 msgstr "Hyperlink"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr ""
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr ""
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 #, fuzzy
 msgid "brown"
 msgstr "Thrown"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 #, fuzzy
 msgid "rainbow 1"
 msgstr "Rainbow"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 #, fuzzy
 msgid "rainbow 2"
 msgstr "Rainbow"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 #, fuzzy
 msgid "rainbow 3"
 msgstr "Rainbow"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d players are present."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
@@ -1202,7 +818,7 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1219,11 +835,11 @@ msgstr "Equipment"
 msgid "Unequip"
 msgstr "Unequip"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Close"
@@ -1310,39 +926,39 @@ msgstr "Retrieve"
 msgid "Drop"
 msgstr "Drop"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "All"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Select amount of items to trade."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Select amount of items to drop."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Select amount of items to store."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Select amount of items to retrieve."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Select amount of items to split."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 #, fuzzy
 msgid "Unknown."
 msgstr "Unknown error"
@@ -1489,7 +1105,7 @@ msgstr "Close"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Login"
 
@@ -1511,11 +1127,11 @@ msgstr "Remember Username"
 msgid "Update:"
 msgstr ""
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Register"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
@@ -2011,56 +1627,56 @@ msgstr "Choose your server"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:229
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:246
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:232
-msgid "Use same ip for game sub servers"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Connect"
 msgstr "Connecting..."
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 #, fuzzy
 msgid "Custom Server"
 msgstr "Custom cursor"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Please type both the address and the port of a server."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Waiting for server"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3579,34 +3195,34 @@ msgstr "You don't have enough money."
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Updating..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Play"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1  The update process is incomplete."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1  It is strongly recommended that"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  you try again later"
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Completed"
 
@@ -3851,6 +3467,11 @@ msgstr "Command: /op <nick>"
 msgid "This command makes <nick> a channel operator."
 msgstr "This command makes <nick> a channel operator."
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "If the <nick> has spaces in it, enclose it in double quotes (\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "Channel operators can kick and op other users from the channel."
@@ -3915,6 +3536,11 @@ msgstr "Command: /item"
 msgid "This command ignores the other player regardless of current relations."
 msgstr "This command displays the number of players currently online."
 
+#: src/gui/widgets/whispertab.cpp:128
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Command: /item <policy>"
+
 #: src/gui/widgets/whispertab.cpp:129
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
@@ -4467,7 +4093,7 @@ msgstr[1] "You picked up %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 #, fuzzy
 msgid "You see "
 msgstr "You get %s."
@@ -5101,20 +4727,20 @@ msgstr "Whisper could not be sent, user is offline."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 #, fuzzy
 msgid "MVP player."
 msgstr "Player"
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 #, fuzzy
 msgid "MVP player: "
 msgstr "Player"
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Channels are not supported!"
 
@@ -5408,6 +5034,10 @@ msgstr "/item > Show/change party item sharing options"
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Show/change party experience sharing options"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "This command invites <nick> to party with you."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "This command causes the player to leave the party."
@@ -5895,6 +5525,247 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Unknown item"
 
+#~ msgid "-- Help --"
+#~ msgstr "-- Help --"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Display this help"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Display map name"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Display number of online users"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Tell something about yourself"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Clears this window"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Send a private message to a user"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > Alias of msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > Alias of msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr "/query > Makes a tab for private messages with another user"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > Alias of query"
+
+#, fuzzy
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/close > Close the whisper tab"
+
+#, fuzzy
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "@@disregard|Disregard %s@@"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Display all public channels"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Join or create a channel"
+
+#, fuzzy
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/create > Create a new party"
+
+#, fuzzy
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/create > Create a new party"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Invite a user to party"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr "/toggle > Determine whether <return> toggles the chat log"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Global announcement (GM only)"
+
+#, fuzzy
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/close > Close the whisper tab"
+
+#, fuzzy
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/msg > Send a private message to a user"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "For more information, type /help <command>."
+
+#~ msgid "Command: /help"
+#~ msgstr "Command: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "This command displays a list of all commands available."
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Command: /help <command>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "This command displays help on <command>."
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Command: /announce <msg>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** only available to a GM ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr ""
+#~ "This command sends the message <msg> to all players currently online."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Command: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "This command clears the chat log of previous chat."
+
+#, fuzzy
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Command: /item <policy>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr "This command displays the number of players currently online."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Command: /join <channel>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "This command makes you enter <channel>."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "If <channel> doesn't exist, it's created."
+
+#~ msgid "Command: /list"
+#~ msgstr "Command: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "This command shows a list of all channels."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Command: /me <message>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "This command tell others you are (doing) <msg>."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Command: /msg <nick> <message>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Command: /whisper <nick> <message>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Command: /w <nick> <message>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "This command sends the text <message> to <nick>."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Command: /query <nick>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Command: /q <nick>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "This command tries to make a tab for whispers between you and <nick>."
+
+#, fuzzy
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Command: /w <nick> <message>"
+
+#, fuzzy
+#~ msgid "Command: /away"
+#~ msgstr "Command: /who"
+
+#, fuzzy
+#~ msgid "This command clears the away status and message."
+#~ msgstr "This command sets the topic to <message>."
+
+#, fuzzy
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Command: /create <party-name>"
+
+#, fuzzy
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "These commands create a new party called <party-name>."
+
+#, fuzzy
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Command: /create <party-name>"
+
+#, fuzzy
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "These commands create a new party called <party-name>."
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Command: /party <nick>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Command: /present"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "This command gets a list of players within hearing and sends it to either "
+#~ "the record log if recording, or the chat log otherwise."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Command: /toggle <state>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Command: /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "This command displays the return toggle status."
+
+#~ msgid "Command: /where"
+#~ msgstr "Command: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "This command displays the name of the current map."
+
+#~ msgid "Command: /who"
+#~ msgstr "Command: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "This command displays the number of players currently online."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Type /help for a list of commands."
+
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Particle Detail"
diff --git a/po/es.po b/po/es.po
index 7e536d2ef..ca9673873 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: manaplus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2011-03-31 21:00+0000\n"
 "Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
 "Language-Team: Spanish (Castilian) <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/being.cpp:489
@@ -53,10 +53,10 @@ msgstr "Conectando al servidor del juego"
 msgid "Changing game servers"
 msgstr "Cambiando el servidor del juego"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -91,537 +91,161 @@ msgstr "Registro cancelado"
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de actualización inválido: %s"
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "¡Error creando la carpeta de actualizaciones!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Comando desconocido."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "--Ayuda--"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Muestra esta ayuda"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Muestra el nombre del mapa"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Muestra el número de jugadores on-line"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Para decir algo sobre ti"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Limpia esta ventana"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Enviar un mensaje privado a un jugador"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Lo mismo que /msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > Lo mismo que /msg"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Abre una pestaña de mensajes con otro jugador"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > Lo mismo que /query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr "/away > Les dice a los otros que estas fuera del PC mensaje privado ."
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Deja de ignorar un jugador"
-
-#: src/commandhandler.cpp:322
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/ignoreall > Ignorar todas las pestañas de susurros abiertas"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr "Borrar un jugador"
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr "/befriend > Ser amigo de un jugador"
-
-#: src/commandhandler.cpp:325
-msgid "/disregard > Disregard a player"
-msgstr "/disregard > Desatender a un jugador"
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr "/neutral > Neutral a un jugador"
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Muestra todos los canales públicos"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Unirse o crear un canal"
-
-#: src/commandhandler.cpp:331
-msgid "/createparty > Create a new party"
-msgstr "/createparty > Crear un nuevo grupo"
-
-#: src/commandhandler.cpp:332
-msgid "/createguild > Create a new guild"
-msgstr "/createguild > Crear un nuevo gremio"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Invitar un jugador al grupo"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Determina si <enter> muestra/esconde el chat"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Muestra la lista de jugadores presentes (enviar al log del chat)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Anuncio Global (Solo GMs)"
-
-#: src/commandhandler.cpp:342
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/closeall > Cerrar todas las pestañas de susurro abiertas"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr "Mostrar todos los seres visibles en la pestaña de depuración"
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr "/move > Mover a la posición dada"
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr "/navigate > Dibujar trayectoria hasta la posición dada"
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr "/target > Poner como objetivo a existencia"
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr "/outfit > Ponerse conjunto por índice"
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr "Mostrar emoticón por índice"
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr "/follow > Seguir a jugador"
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr "/imitation > Imitar a jugador"
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr "/heal > Curar a jugador"
-
-#: src/commandhandler.cpp:354
-msgid "/mail > Send offline message to player"
-msgstr "/mail > Enviar un mensaje sin conexión a jugador"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Para más información,  pon /help <comando>."
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Comando: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Para ver la lista de comandos disponibles."
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Comando: /help <comando>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Para ver la ayuda en <comando>"
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Comando: /announce <mensaje>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** Disponible solo para GMs ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Este comando envía un mensaje <mensaje> para todos los jugadores online."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Comando: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Este comando limpia la pestaña actual del chat previo."
-
-#: src/commandhandler.cpp:386
-msgid "Command: /ignore <player>"
-msgstr "Comando: /ignore <jugador>"
-
-#: src/commandhandler.cpp:387
-msgid "This command ignores the given player regardless of current relations."
-msgstr ""
-"Este comando es para ignorar al jugador indicado, independientemente de la "
-"relación actual."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Comando: /join <canal>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Este comando te hace entrar en <canal>."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Si el  <canal> no existe, sera creado."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Comando: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Este comando muestra una lista con todos los canales."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Comando: /me <mensaje>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr ""
-"Este comando muestra a los otros lo que tú estas (haciendo) <mensaje>."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Comando: /msg <nick> <mensaje>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Comando: /whisper <nick> <mensaje>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Comando: /w <nick> <mensaje>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Este comando envía el texto <mensaje> para el jugador <nick>."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Si <nick> posee espacios, colóquelo entre las comillas dobles (\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Comando: /query <nick>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Comando: /q <nick>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Este comando crea una pestaña para mensajes privados con el jugador <nick>."
-
-#: src/commandhandler.cpp:424
-msgid "Command: /away <afk reason>"
-msgstr "Comando: /away <motivo>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr "Este comando muestra que no estas en el PC por una razon dada."
-
-#: src/commandhandler.cpp:427
-msgid "Command: /away"
-msgstr "Comando: /away"
-
-#: src/commandhandler.cpp:428
-msgid "This command clears the away status and message."
-msgstr "Este comando limpia el status y los mensajes \"away\"."
-
-#: src/commandhandler.cpp:432
-msgid "Command: /createparty <name>"
-msgstr "Comando: /createparty <nombre>"
-
-#: src/commandhandler.cpp:433
-msgid "This command creates a new party called <name>."
-msgstr "Este comando crea un nuevo grupo llamado <nombre>."
-
-#: src/commandhandler.cpp:437
-msgid "Command: /createguild <name>"
-msgstr "Comando: /createguild <nombre>"
-
-#: src/commandhandler.cpp:438
-msgid "This command creates a new guild called <name>."
-msgstr "Este comando crea un nuevo gremio llamado <nombre>."
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Comando: /party <nick>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Este comando invita al jugador <nick> a formar parte de tu grupo."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Comando: /present"
-
-#: src/commandhandler.cpp:450
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"Este comando obtiene una lista de los jugadores dentro de la audiencia y lo "
-"envía al registro de la charla."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Comando: /toggle <estado>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Este comando determina si la tecla de retorno debe cambiar el registro de "
-"charla, o si el registro de charla se apaga automáticamente."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<estado> puede ser \"1\", \"yes\" y \"true\" para activar o \"0\", \"no\" y "
-"\"false\" para desactivar."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Comando: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "Este comando muestra el estado de alternar retorno."
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-msgid "Command: /unignore <player>"
-msgstr "Comando: /unignore <jugador>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-"Este comando deja de ignorar al jugador dado cuando está siendo ignorado"
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Comando: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Muestra el nombre del mapa actual."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Comando: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Este comando muestra el número de jugadores que están en línea."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Escribe /help para una lista de comandos."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "¡No puedes enviar susurros vacíos!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 "No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando la entrada del canal %s."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 msgid "Guild name is missing."
 msgstr "Falta el nombre del clan."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "El mensaje cierra el chat."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 msgid "disregarded"
 msgstr "desatendido"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya %s!"
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Jugador %s exitosamente!"
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estaba ignorado!"
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr "El jugador ha sido devuelto al estado normal!"
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 msgid "Player could not be unignored!"
 msgstr "El jugador no puede ser devuelto al estado normal!"
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 msgid "Player successfully erased!"
 msgstr "¡Jugador borrado con éxito!"
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -631,7 +255,8 @@ msgstr[1] "%d segundos"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -718,12 +343,12 @@ msgstr "Resultado"
 msgid "Reset"
 msgstr "Resetear"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -731,50 +356,52 @@ msgstr "Precio: %s / Total: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr "-"
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Salir"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Máximo"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Tienda"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -924,7 +551,7 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Cambiar e-mail"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -943,80 +570,80 @@ msgstr "Nivel: %d"
 msgid "(empty)"
 msgstr "(vacío)"
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 msgid "default"
 msgstr "Por defecto"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr "negro"
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 msgid "red"
 msgstr "rojo"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 msgid "green"
 msgstr "verde"
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 msgid "blue"
 msgstr "azul"
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr "dorado"
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 msgid "yellow"
 msgstr "amarillo"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 msgid "pink"
 msgstr "rosa"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr "púrpura"
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr "gris"
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 msgid "brown"
 msgstr "marrón"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 msgid "rainbow 1"
 msgstr "arco iris 1"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 msgid "rainbow 2"
 msgstr "arco iris 2"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 msgid "rainbow 3"
 msgstr "arco iris 3"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores estan presentes."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando mensaje privado para %s: %s"
@@ -1140,7 +767,7 @@ msgstr "In: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Out: %d bytes/s"
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1157,11 +784,11 @@ msgstr "Equipamento"
 msgid "Unequip"
 msgstr "Quitárselo"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Cerrar"
@@ -1244,39 +871,39 @@ msgstr "Retirar"
 msgid "Drop"
 msgstr "Tirar"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Todo"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Selecionar la cantidad de objetos a intercambiar."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Selecionar cantidad de objetos a tirar."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Seleccione la cantidad de objetos a almacenar."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Selecciona la cantidad de objetos a retirar."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Selecionar la cantidad de objetos para dividir."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Agregar a tienda de compra."
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Agregar a tienda de venta."
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Desconocido."
 
@@ -1416,7 +1043,7 @@ msgstr "Auto Cerrar"
 msgid "Skip"
 msgstr "Saltar"
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Login"
 
@@ -1437,11 +1064,11 @@ msgstr "Recordar nombre de usuario"
 msgid "Update:"
 msgstr "Actualizar:"
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 msgid "Change Server"
 msgstr "Cambiar de servidor"
 
@@ -1889,52 +1516,52 @@ msgstr "Escoja tu servidor"
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/gui/serverdialog.cpp:229
-msgid "Server type:"
-msgstr "Tipo de servidor:"
-
-#: src/gui/serverdialog.cpp:232
+#: src/gui/serverdialog.cpp:231
 msgid "Use same ip for game sub servers"
 msgstr "Usar el mismo ip para los subservidores del juego"
 
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:246
+msgid "Server type:"
+msgstr "Tipo de servidor:"
+
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr "Cargar"
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 msgid "Custom Server"
 msgstr "Servidor propio"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique el nombre y el puerto del servidor."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr "Error al recuperar la lista de servers!"
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr "requiere una version mas nueva"
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -3366,8 +2993,7 @@ msgid "Change"
 msgstr "Cambiar"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
@@ -3381,33 +3007,33 @@ msgstr "No tienes dinero suficiente."
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Jugar"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##3  El proceso de actualización esta incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 msgid "##1  you try again later."
 msgstr "##1 lo intentes de nuevo más tarde."
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Completado"
 
@@ -3635,6 +3261,11 @@ msgstr "Comando: /op <nick>"
 msgid "This command makes <nick> a channel operator."
 msgstr "Hacer al jugador <nick> operador del canal."
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Si <nick> posee espacios, colóquelo entre las comillas dobles (\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3701,9 +3332,12 @@ msgstr ""
 "Este comando ignora a otro jugador independientemente de la relación actual "
 "con él."
 
+#: src/gui/widgets/whispertab.cpp:128
+msgid "Command: /unignore <player>"
+msgstr "Comando: /unignore <jugador>"
+
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando para de ignorar al jugador si había sido ignorado."
 
 #: src/gui/windowmenu.cpp:62
@@ -4222,7 +3856,7 @@ msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 msgid "You see "
 msgstr "Vez "
 
@@ -4405,8 +4039,7 @@ msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
-"Parece que tu plan de romper las armas de tus enemigos con tu garganta "
-"falló!"
+"Parece que tu plan de romper las armas de tus enemigos con tu garganta falló!"
 
 #: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:111
 msgid "I guess this did not run too well."
@@ -4806,18 +4439,18 @@ msgstr "No pudo ser enviado el Susurro, ya que %s está desconectado."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 msgid "MVP player."
 msgstr "Jugador VIP."
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 msgid "MVP player: "
 msgstr "Jugador MVP: "
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Canales no son soportados!"
 
@@ -4913,6 +4546,7 @@ msgid "M.Defense"
 msgstr "Defensa M."
 
 #: src/net/tmwa/generalhandler.cpp:259
+#, fuzzy
 msgid "% Accuracy"
 msgstr "% Presición"
 
@@ -5083,6 +4717,10 @@ msgstr "/item > Mostrar/Cambiar el compartir objetos en el grupo"
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Mostrar/Modificar el compartir experiencia en el grupo "
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Este comando invita al jugador <nick> a formar parte de tu grupo."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Este comando hace que dejes el grupo."
@@ -5109,8 +4747,7 @@ msgstr "Comando: /item"
 
 #: src/net/tmwa/gui/partytab.cpp:100
 msgid "This command displays the party's current item sharing policy."
-msgstr ""
-"Este comando muestra el actual estado de compartir objetos en el grupo"
+msgstr "Este comando muestra el actual estado de compartir objetos en el grupo"
 
 #: src/net/tmwa/gui/partytab.cpp:105
 msgid "Command: /exp <policy>"
@@ -5205,8 +4842,8 @@ msgstr "Rechazado del servidor."
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Has sido baneado permanentemente del juego. Por favor contacta con el equipo"
-" GM."
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
+"GM."
 
 #: src/net/tmwa/loginhandler.cpp:178
 #, c-format
@@ -5357,13 +4994,11 @@ msgstr "Mensaje"
 
 #: src/net/tmwa/playerhandler.cpp:332
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
 #: src/net/tmwa/playerhandler.cpp:342
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
 
@@ -5555,3 +5190,287 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:155
 msgid "Unknown item"
 msgstr "Objeto desconocido"
+
+#~ msgid "-- Help --"
+#~ msgstr "--Ayuda--"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Muestra esta ayuda"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Muestra el nombre del mapa"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Muestra el número de jugadores on-line"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Para decir algo sobre ti"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Limpia esta ventana"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Enviar un mensaje privado a un jugador"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > Lo mismo que /msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > Lo mismo que /msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr "/query > Abre una pestaña de mensajes con otro jugador"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > Lo mismo que /query"
+
+#~ msgid "/away > Tell the other whispering players you're away from keyboard."
+#~ msgstr ""
+#~ "/away > Les dice a los otros que estas fuera del PC mensaje privado ."
+
+#~ msgid "/ignore > ignore a player"
+#~ msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
+
+#~ msgid "/unignore > stop ignoring a player"
+#~ msgstr "/unignore > Deja de ignorar un jugador"
+
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/ignoreall > Ignorar todas las pestañas de susurros abiertas"
+
+#~ msgid "/erase > Erase a player"
+#~ msgstr "Borrar un jugador"
+
+#~ msgid "/befriend > Be friend a player"
+#~ msgstr "/befriend > Ser amigo de un jugador"
+
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "/disregard > Desatender a un jugador"
+
+#~ msgid "/neutral > Neutral a player"
+#~ msgstr "/neutral > Neutral a un jugador"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Muestra todos los canales públicos"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Unirse o crear un canal"
+
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/createparty > Crear un nuevo grupo"
+
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/createguild > Crear un nuevo gremio"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Invitar un jugador al grupo"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr "/toggle > Determina si <enter> muestra/esconde el chat"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Muestra la lista de jugadores presentes (enviar al log del "
+#~ "chat)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Anuncio Global (Solo GMs)"
+
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/closeall > Cerrar todas las pestañas de susurro abiertas"
+
+#~ msgid "/all > Show all visible beings in debug tab"
+#~ msgstr "Mostrar todos los seres visibles en la pestaña de depuración"
+
+#~ msgid "/move > Move to given position"
+#~ msgstr "/move > Mover a la posición dada"
+
+#~ msgid "/navigate > Draw path to given position"
+#~ msgstr "/navigate > Dibujar trayectoria hasta la posición dada"
+
+#~ msgid "/target > Set target to being"
+#~ msgstr "/target > Poner como objetivo a existencia"
+
+#~ msgid "/outfit > Wear outfit by index"
+#~ msgstr "/outfit > Ponerse conjunto por índice"
+
+#~ msgid "/emote > Show emote by index"
+#~ msgstr "Mostrar emoticón por índice"
+
+#~ msgid "/follow > Follow player"
+#~ msgstr "/follow > Seguir a jugador"
+
+#~ msgid "/imitation > Imitate player"
+#~ msgstr "/imitation > Imitar a jugador"
+
+#~ msgid "/heal > Heal player"
+#~ msgstr "/heal > Curar a jugador"
+
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/mail > Enviar un mensaje sin conexión a jugador"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Para más información,  pon /help <comando>."
+
+#~ msgid "Command: /help"
+#~ msgstr "Comando: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Para ver la lista de comandos disponibles."
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Comando: /help <comando>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Para ver la ayuda en <comando>"
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Comando: /announce <mensaje>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** Disponible solo para GMs ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr ""
+#~ "Este comando envía un mensaje <mensaje> para todos los jugadores online."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Comando: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Este comando limpia la pestaña actual del chat previo."
+
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Comando: /ignore <jugador>"
+
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr ""
+#~ "Este comando es para ignorar al jugador indicado, independientemente de "
+#~ "la relación actual."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Comando: /join <canal>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Este comando te hace entrar en <canal>."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Si el  <canal> no existe, sera creado."
+
+#~ msgid "Command: /list"
+#~ msgstr "Comando: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Este comando muestra una lista con todos los canales."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Comando: /me <mensaje>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr ""
+#~ "Este comando muestra a los otros lo que tú estas (haciendo) <mensaje>."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Comando: /msg <nick> <mensaje>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Comando: /whisper <nick> <mensaje>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Comando: /w <nick> <mensaje>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Este comando envía el texto <mensaje> para el jugador <nick>."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Comando: /query <nick>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Comando: /q <nick>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Este comando crea una pestaña para mensajes privados con el jugador "
+#~ "<nick>."
+
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Comando: /away <motivo>"
+
+#~ msgid "This command tells you're away from keyboard with the given reason."
+#~ msgstr "Este comando muestra que no estas en el PC por una razon dada."
+
+#~ msgid "Command: /away"
+#~ msgstr "Comando: /away"
+
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Este comando limpia el status y los mensajes \"away\"."
+
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Comando: /createparty <nombre>"
+
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Este comando crea un nuevo grupo llamado <nombre>."
+
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Comando: /createguild <nombre>"
+
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Este comando crea un nuevo gremio llamado <nombre>."
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Comando: /party <nick>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Comando: /present"
+
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "Este comando obtiene una lista de los jugadores dentro de la audiencia y "
+#~ "lo envía al registro de la charla."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Comando: /toggle <estado>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr ""
+#~ "Este comando determina si la tecla de retorno debe cambiar el registro de "
+#~ "charla, o si el registro de charla se apaga automáticamente."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<estado> puede ser \"1\", \"yes\" y \"true\" para activar o \"0\", \"no\" "
+#~ "y \"false\" para desactivar."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Comando: /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "Este comando muestra el estado de alternar retorno."
+
+#~ msgid ""
+#~ "This command stops ignoring the given player if they are being ignored"
+#~ msgstr ""
+#~ "Este comando deja de ignorar al jugador dado cuando está siendo ignorado"
+
+#~ msgid "Command: /where"
+#~ msgstr "Comando: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Muestra el nombre del mapa actual."
+
+#~ msgid "Command: /who"
+#~ msgstr "Comando: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Este comando muestra el número de jugadores que están en línea."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Escribe /help para una lista de comandos."
diff --git a/po/fr.po b/po/fr.po
index 8771abcf0..ad71d92de 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: manaplus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2011-03-31 19:28+0000\n"
 "Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
 "Language-Team: French <>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/being.cpp:489
@@ -53,10 +53,10 @@ msgstr "Connexion au serveur de jeu"
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -91,551 +91,161 @@ msgstr "Désinscription réussie"
 msgid "Farewell, come back any time..."
 msgstr "Adieu, revenez dès que vous le souhaitez..."
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fin du programme."
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Mise à jour incorrecte de l'hôte : %s"
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erreur : %s n'existe pas et ne peut pas être créer ! Fin et sortie."
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "-- Aide --"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Montre l'aide"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Affiche le nom de la carte et votre localisation"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Dire quelque chose à votre propos"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Efface le contenu de cette fenêtre"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Envoie un message privé à un utilisateur"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias de message"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > Alias de message"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
-"/query > Créé un nouvel onglet pour vos messages privés avec un autre "
-"utilisateur"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > Alias de query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-"/away > Indique aux autres joueurs que vous n'êtes actuellement pas devant "
-"votre écran."
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Ignorer un joueur"
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Cesser d'ignorer un joueur"
-
-#: src/commandhandler.cpp:322
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/ignoreall > Ignore tous les joueurs dont les onglets sont ouverts"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr "/erase > Eliminer un joueur"
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr "/befriend > Être ami avec un joueur"
-
-#: src/commandhandler.cpp:325
-msgid "/disregard > Disregard a player"
-msgstr "/disregard > Écarter un joueur"
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr "/neutral > Ramener un joueur à l'état par défaut"
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Affiche une liste de tous les salons publics"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Rejoindre ou créer un salon."
-
-#: src/commandhandler.cpp:331
-msgid "/createparty > Create a new party"
-msgstr "/createparty > Créer un nouveau groupe"
-
-#: src/commandhandler.cpp:332
-msgid "/createguild > Create a new guild"
-msgstr "/createguild > créer une guilde"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Invite un utilisateur dans un groupe"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-"/toggle > Détermine si la touche <entrée> bascule l'historique du tchat"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Obtiens la liste des joueurs présents (envoyée dans l'historique "
-"du tchat s'il a été activé)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Annonce globale (GM uniquement)"
-
-#: src/commandhandler.cpp:342
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/closeall > Fermer tous les onglets ouverts"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr ""
-"/all > Montrer tous les personnages visibles dans la fenêtre de 'debug' "
-"(informations)"
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr "/move > Se déplacer jusqu'à la position donnée"
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr "/navigate > Afficher le chemin jusqu'à la position donnée"
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr "/target > Prendre le joueur désigné pour cible"
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr "/outfit > Revêtir une tenue selon l'index choisi"
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr "/emote > Afficher l'émoticône selon l'index donné"
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr "/follow > Suivre le joueur"
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr "/imitation > Imiter le joueur"
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr "/heal > Soigner un Joueur"
-
-#: src/commandhandler.cpp:354
-msgid "/mail > Send offline message to player"
-msgstr "/mail > Envoyer un message à un joueur hors ligne"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Pour plus d'informations, taper /help <commande>"
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Commande : /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Cette commande affiche une liste de toutes les commandes disponibles."
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Commande : /help <commande>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Cette commande affiche une aide sur la commande <command>."
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Commande : /announce <message>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** uniquement disponible pour les GM ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Cette commande envoie le message <message> à tous les joueurs en ligne."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Commande : /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr ""
-"Cette commande vide l'historique de conversation de la conversation "
-"précédente."
-
-#: src/commandhandler.cpp:386
-msgid "Command: /ignore <player>"
-msgstr "Commande : /ignore <joueur>"
-
-#: src/commandhandler.cpp:387
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Cette commande ignore le joueur qu'il soit indiqué comme ami ou non."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Commande : /join <channel>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Cette commande vous fait rentrer dans le salon <channel>."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Si <channel> n'existe pas, il sera créé."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Commande : /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Cette commande affiche une liste de tous les salons publics."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Commande : /me <message>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Cette commande informe les autres joueurs que vous faites <message>."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Commande : /msg <nom du personnage> <message>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Commande : /whisper <nom du personnage> <message>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Commande : /w <nom du personnage> <message>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr ""
-"Cette commande envoie le texte <message> au joueur <nom du personnage>"
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Si le <nom du personnage> contient des espaces, entourez le de guillemets "
-"(exemple : \"ni ck\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Commande : /query <nom du personnage>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Commande : /q <nom du personnage>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Cette commande essaye de créer une fenêtre de dialogue entre vous et <nom du"
-" personnage>"
-
-#: src/commandhandler.cpp:424
-msgid "Command: /away <afk reason>"
-msgstr "Commande : /away <message d'absence>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-"Cette commande indique que vous n'êtes pas devant votre écran en indiquant "
-"la raison."
-
-#: src/commandhandler.cpp:427
-msgid "Command: /away"
-msgstr "Commande : /away"
-
-#: src/commandhandler.cpp:428
-msgid "This command clears the away status and message."
-msgstr "Cette commande retire le statut absent."
-
-#: src/commandhandler.cpp:432
-msgid "Command: /createparty <name>"
-msgstr "Commande : /createparty <nom du groupe>"
-
-#: src/commandhandler.cpp:433
-msgid "This command creates a new party called <name>."
-msgstr "Cette commande crée un nouveau groupe appelé <nom>"
-
-#: src/commandhandler.cpp:437
-msgid "Command: /createguild <name>"
-msgstr "Commande: /createguild <nom>"
-
-#: src/commandhandler.cpp:438
-msgid "This command creates a new guild called <name>."
-msgstr "Cette commande crée une nouvelle guilde appelée <nom>."
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Commande : /party <nom du personnage>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Commande : /present"
-
-#: src/commandhandler.cpp:450
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"Cette commande renvoie la liste des joueurs présents qui peuvent vous "
-"entendre, dans la fenêtre de discussion."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Commande : /toggle <état>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Cette commande bascule la fonction de la touche \"retour\" entre \"ouverture"
-" / fermeture\" et \"fermeture automatique\" de la ligne de discussion."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<état> peut être en position \"1\", \"yes\", \"true\" pour activer le bouton"
-" sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Commande : /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "Cette commande vous affiche le statut du toggle courant."
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-msgid "Command: /unignore <player>"
-msgstr "Commande : /unignore <joueur>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-"Cette commande fait cesser d'ignorer le joueur donné s'il l'était "
-"précédemment."
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Commande : /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Cette commande affiche le nom de la carte où vous vous trouvez."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Commande : /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Il ne peut être créer une fenêtre de conversation avec le personnage \"%s\" "
-"! Elle existe déjà ou il s'agit de vous même."
+"Il ne peut être créer une fenêtre de conversation avec le personnage \"%s"
+"\" ! Elle existe déjà ou il s'agit de vous même."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Demande  de rejoindre le canal %s."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Indiquez un nom de groupe."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 msgid "Guild name is missing."
 msgstr "Le nom de la guilde est manquant."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr "Veuillez indiquer un nom."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "La touche enter ferme maintenant la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "Ce message ferme la conversation."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "La touche enter ferme la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Ce message ferme maintenant la conversation."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 msgid "friend"
 msgstr "ami"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 msgid "disregarded"
 msgstr "écarté"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 msgid "neutral"
 msgstr "neutre"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur victorieux %s !"
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 msgid "Player could not be unignored!"
 msgstr "Le joueur n'a pas pu être à nouveau écouté !"
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 msgid "Player successfully erased!"
 msgstr "Joueur éliminé avec succès !"
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 msgid "Player could not be erased!"
 msgstr "le joueur n'a pas pu être effacé !"
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -646,8 +256,8 @@ msgstr[1] "%d secondes"
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", "
-"\"true\", \"false\", \"1\", \"0\"."
+"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
+"\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -735,12 +345,12 @@ msgstr "Résultat"
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Acheter"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -748,50 +358,52 @@ msgstr "Prix : %s / Total : %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr "-"
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Max."
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Magasin"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Vendre"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -941,7 +553,7 @@ msgstr "Se désinscrire"
 msgid "Change Email"
 msgstr "Modifier l'adresse e-mail"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -960,80 +572,80 @@ msgstr "Niveau %d"
 msgid "(empty)"
 msgstr "(vide)"
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 msgid "default"
 msgstr "défaut"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr "noir"
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 msgid "red"
 msgstr "rouge"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 msgid "green"
 msgstr "vert"
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 msgid "blue"
 msgstr "bleu"
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr "or"
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 msgid "yellow"
 msgstr "jaune"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 msgid "pink"
 msgstr "rose"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr "violet"
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr "gris"
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 msgid "brown"
 msgstr "marron"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 msgid "rainbow 1"
 msgstr "arc en ciel 1"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 msgid "rainbow 2"
 msgstr "arc en ciel 2"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 msgid "rainbow 3"
 msgstr "arc en ciel 3"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message privé envoyé à %s : %s"
@@ -1157,7 +769,7 @@ msgstr "Entrée : %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Sortie : %d bytes/s"
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1174,11 +786,11 @@ msgstr "Équipement"
 msgid "Unequip"
 msgstr "Retirer"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Aide"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Fermer"
@@ -1261,39 +873,39 @@ msgstr "Récupérer"
 msgid "Drop"
 msgstr "Jeter"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tout"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Choisissez le nombre d'objets à troquer."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Choisissez le nombre d'objets à jeter."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Sélectionnez le nombre d'objets à stocker."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Sélectionnez le nombre d'objet à reprendre"
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Choisissez le nombre d'objets à séparer."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Ajouter au magasin pour l'achat."
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Ajouter au magasin pour la vente."
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Inconnu."
 
@@ -1432,7 +1044,7 @@ msgstr "Fermeture automatique"
 msgid "Skip"
 msgstr "Sauter"
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Connexion"
 
@@ -1453,11 +1065,11 @@ msgstr "Se souvenir du nom d'utilisateur"
 msgid "Update:"
 msgstr "Mise à jour : "
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "S'inscrire"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 msgid "Change Server"
 msgstr "Changer de Serveur"
 
@@ -1905,52 +1517,52 @@ msgstr "Choisissez le serveur"
 msgid "Port:"
 msgstr "Port :"
 
-#: src/gui/serverdialog.cpp:229
-msgid "Server type:"
-msgstr "Type de Serveur :"
-
-#: src/gui/serverdialog.cpp:232
+#: src/gui/serverdialog.cpp:231
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:246
+msgid "Server type:"
+msgstr "Type de Serveur :"
+
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr "Charger"
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 msgid "Connect"
 msgstr "Connexion..."
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 msgid "Custom Server"
 msgstr "Serveur personnalisé"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Veuillez entrer l'adresse et le port du serveur."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste !"
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -2811,8 +2423,7 @@ msgstr "Accepter l'invitation dans cette guilde"
 #: src/gui/socialwindow.cpp:1136
 msgid "Received party request, but one already exists."
 msgstr ""
-"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà "
-"un."
+"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
 #: src/gui/socialwindow.cpp:1147
 msgid "You have been invited you to join a party."
@@ -3390,8 +3001,7 @@ msgid "Change"
 msgstr "Changer"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
@@ -3405,33 +3015,33 @@ msgstr "Vous n'avez pas assez d'argent."
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Mise à jour en cours..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 msgid "##1  you try again later."
 msgstr "##1 Essayez à nouveau plus tard"
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Terminé"
 
@@ -3629,8 +3239,7 @@ msgstr "Commande : /users"
 
 #: src/gui/widgets/channeltab.cpp:65
 msgid "This command shows the users in this channel."
-msgstr ""
-"Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: src/gui/widgets/channeltab.cpp:69
 msgid "Command: /topic <message>"
@@ -3662,6 +3271,13 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 "Cette commande donne les droit d'opérateur du salon à <nom du personnage>"
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+"Si le <nom du personnage> contient des espaces, entourez le de guillemets "
+"(exemple : \"ni ck\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3728,11 +3344,13 @@ msgstr ""
 "Cette commande permet d'ignorer un joueur qu'il soit indiqué comme ami ou "
 "non."
 
+#: src/gui/widgets/whispertab.cpp:128
+msgid "Command: /unignore <player>"
+msgstr "Commande : /unignore <joueur>"
+
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:62
 msgid "BC"
@@ -4202,8 +3820,8 @@ msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
-"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une"
-" des touches ou attendez vous à un possible comportement étrange du jeu."
+"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
+"des touches ou attendez vous à un possible comportement étrange du jeu."
 
 #: src/localplayer.cpp:338
 msgid "You were killed by "
@@ -4250,7 +3868,7 @@ msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 msgid "You see "
 msgstr "Vous voyez  "
 
@@ -4343,8 +3961,7 @@ msgstr ""
 
 #: src/main.cpp:69
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #: src/main.cpp:70
 msgid "     --safemode       : Start game in safe mode"
@@ -4851,18 +4468,18 @@ msgstr "Le message n'a pu être envoyé, %s n'est pas en ligne."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Le message privé n'a pu être envoyé, vous êtes ignoré par %s."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 msgid "MVP player."
 msgstr "Joueur MVP"
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 msgid "MVP player: "
 msgstr "MVP joueur :"
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Les salons ne sont pas gérés !"
 
@@ -5128,6 +4745,10 @@ msgstr "/item > Affiche / Modifie les préférences d'échange d'objet du groupe
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Cette commande vous fait quitter votre groupe actuel."
@@ -5407,18 +5028,16 @@ msgstr "Message"
 
 #: src/net/tmwa/playerhandler.cpp:332
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
-"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus"
-" en mesure de regagner vos points de vie."
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
+"en mesure de regagner vos points de vie."
 
 #: src/net/tmwa/playerhandler.cpp:342
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
-"Vous portez moins de la moitié du poids de votre inventaire.Vous pouvez vous"
-" régénérez de nouveau."
+"Vous portez moins de la moitié du poids de votre inventaire.Vous pouvez vous "
+"régénérez de nouveau."
 
 #: src/net/tmwa/playerhandler.cpp:447
 #, c-format
@@ -5612,3 +5231,300 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:155
 msgid "Unknown item"
 msgstr "Objet inconnu"
+
+#~ msgid "-- Help --"
+#~ msgstr "-- Aide --"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Montre l'aide"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Affiche le nom de la carte et votre localisation"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Dire quelque chose à votre propos"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Efface le contenu de cette fenêtre"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Envoie un message privé à un utilisateur"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > Alias de message"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > Alias de message"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr ""
+#~ "/query > Créé un nouvel onglet pour vos messages privés avec un autre "
+#~ "utilisateur"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > Alias de query"
+
+#~ msgid "/away > Tell the other whispering players you're away from keyboard."
+#~ msgstr ""
+#~ "/away > Indique aux autres joueurs que vous n'êtes actuellement pas "
+#~ "devant votre écran."
+
+#~ msgid "/ignore > ignore a player"
+#~ msgstr "/ignore > Ignorer un joueur"
+
+#~ msgid "/unignore > stop ignoring a player"
+#~ msgstr "/unignore > Cesser d'ignorer un joueur"
+
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/ignoreall > Ignore tous les joueurs dont les onglets sont ouverts"
+
+#~ msgid "/erase > Erase a player"
+#~ msgstr "/erase > Eliminer un joueur"
+
+#~ msgid "/befriend > Be friend a player"
+#~ msgstr "/befriend > Être ami avec un joueur"
+
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "/disregard > Écarter un joueur"
+
+#~ msgid "/neutral > Neutral a player"
+#~ msgstr "/neutral > Ramener un joueur à l'état par défaut"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Affiche une liste de tous les salons publics"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Rejoindre ou créer un salon."
+
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/createparty > Créer un nouveau groupe"
+
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/createguild > créer une guilde"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Invite un utilisateur dans un groupe"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr ""
+#~ "/toggle > Détermine si la touche <entrée> bascule l'historique du tchat"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Obtiens la liste des joueurs présents (envoyée dans "
+#~ "l'historique du tchat s'il a été activé)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Annonce globale (GM uniquement)"
+
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/closeall > Fermer tous les onglets ouverts"
+
+#~ msgid "/all > Show all visible beings in debug tab"
+#~ msgstr ""
+#~ "/all > Montrer tous les personnages visibles dans la fenêtre de "
+#~ "'debug' (informations)"
+
+#~ msgid "/move > Move to given position"
+#~ msgstr "/move > Se déplacer jusqu'à la position donnée"
+
+#~ msgid "/navigate > Draw path to given position"
+#~ msgstr "/navigate > Afficher le chemin jusqu'à la position donnée"
+
+#~ msgid "/target > Set target to being"
+#~ msgstr "/target > Prendre le joueur désigné pour cible"
+
+#~ msgid "/outfit > Wear outfit by index"
+#~ msgstr "/outfit > Revêtir une tenue selon l'index choisi"
+
+#~ msgid "/emote > Show emote by index"
+#~ msgstr "/emote > Afficher l'émoticône selon l'index donné"
+
+#~ msgid "/follow > Follow player"
+#~ msgstr "/follow > Suivre le joueur"
+
+#~ msgid "/imitation > Imitate player"
+#~ msgstr "/imitation > Imiter le joueur"
+
+#~ msgid "/heal > Heal player"
+#~ msgstr "/heal > Soigner un Joueur"
+
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/mail > Envoyer un message à un joueur hors ligne"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Pour plus d'informations, taper /help <commande>"
+
+#~ msgid "Command: /help"
+#~ msgstr "Commande : /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr ""
+#~ "Cette commande affiche une liste de toutes les commandes disponibles."
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Commande : /help <commande>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Cette commande affiche une aide sur la commande <command>."
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Commande : /announce <message>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** uniquement disponible pour les GM ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr ""
+#~ "Cette commande envoie le message <message> à tous les joueurs en ligne."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Commande : /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr ""
+#~ "Cette commande vide l'historique de conversation de la conversation "
+#~ "précédente."
+
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Commande : /ignore <joueur>"
+
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr ""
+#~ "Cette commande ignore le joueur qu'il soit indiqué comme ami ou non."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Commande : /join <channel>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Cette commande vous fait rentrer dans le salon <channel>."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Si <channel> n'existe pas, il sera créé."
+
+#~ msgid "Command: /list"
+#~ msgstr "Commande : /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Cette commande affiche une liste de tous les salons publics."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Commande : /me <message>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr ""
+#~ "Cette commande informe les autres joueurs que vous faites <message>."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Commande : /msg <nom du personnage> <message>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Commande : /whisper <nom du personnage> <message>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Commande : /w <nom du personnage> <message>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr ""
+#~ "Cette commande envoie le texte <message> au joueur <nom du personnage>"
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Commande : /query <nom du personnage>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Commande : /q <nom du personnage>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Cette commande essaye de créer une fenêtre de dialogue entre vous et <nom "
+#~ "du personnage>"
+
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Commande : /away <message d'absence>"
+
+#~ msgid "This command tells you're away from keyboard with the given reason."
+#~ msgstr ""
+#~ "Cette commande indique que vous n'êtes pas devant votre écran en "
+#~ "indiquant la raison."
+
+#~ msgid "Command: /away"
+#~ msgstr "Commande : /away"
+
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Cette commande retire le statut absent."
+
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Commande : /createparty <nom du groupe>"
+
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Cette commande crée un nouveau groupe appelé <nom>"
+
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Commande: /createguild <nom>"
+
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Cette commande crée une nouvelle guilde appelée <nom>."
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Commande : /party <nom du personnage>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Commande : /present"
+
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "Cette commande renvoie la liste des joueurs présents qui peuvent vous "
+#~ "entendre, dans la fenêtre de discussion."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Commande : /toggle <état>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr ""
+#~ "Cette commande bascule la fonction de la touche \"retour\" entre "
+#~ "\"ouverture / fermeture\" et \"fermeture automatique\" de la ligne de "
+#~ "discussion."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<état> peut être en position \"1\", \"yes\", \"true\" pour activer le "
+#~ "bouton sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Commande : /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "Cette commande vous affiche le statut du toggle courant."
+
+#~ msgid ""
+#~ "This command stops ignoring the given player if they are being ignored"
+#~ msgstr ""
+#~ "Cette commande fait cesser d'ignorer le joueur donné s'il l'était "
+#~ "précédemment."
+
+#~ msgid "Command: /where"
+#~ msgstr "Commande : /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Cette commande affiche le nom de la carte où vous vous trouvez."
+
+#~ msgid "Command: /who"
+#~ msgstr "Commande : /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
diff --git a/po/hr.po b/po/hr.po
index 1e09bee9e..8c35c4288 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -61,10 +61,10 @@ msgstr "Spajanje na poslužitelja karti..."
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -103,415 +103,34 @@ msgstr "Odjavi"
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Nepoznata naredba."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "-- Pomoć --"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Prikaži ovu pomoć"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Prikaži ime karte"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Prikaži broj trenutno prijavljenih korisnika"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Recite nešto o sebi"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Očisti ovaj prozor"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Pošaljite privatnu poruku korisniku"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias za msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > Alias za msg"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Čini karticu za privatne poruke s drugim korisnikom"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > Alias od query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:322
-#, fuzzy
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/close > Zatvara karticu za šaptaje"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr ""
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr ""
-
-#: src/commandhandler.cpp:325
-#, fuzzy
-msgid "/disregard > Disregard a player"
-msgstr "@@disregard|Zanemari %s@@"
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr ""
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Prikaži sve javne kanale"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Pridruži se ili napravi kanal"
-
-#: src/commandhandler.cpp:331
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Napravi novu partiju"
-
-#: src/commandhandler.cpp:332
-#, fuzzy
-msgid "/createguild > Create a new guild"
-msgstr "/create > Napravi novu partiju"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Pozovite korisnike na partiju"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globalna obavijest (samo GM)"
-
-#: src/commandhandler.cpp:342
-#, fuzzy
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/close > Zatvara karticu za šaptaje"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr ""
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr ""
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr ""
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr ""
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr ""
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr ""
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr ""
-
-#: src/commandhandler.cpp:354
-#, fuzzy
-msgid "/mail > Send offline message to player"
-msgstr "/msg > Pošaljite privatnu poruku korisniku"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Za više informacija, utipkajte /pomoć <naredba>."
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Naredba: /pomoć"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Ova naredba prikazuje listu svih raspoloživih naredbi."
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Naredba: /pomoć <naredba>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Ova naredba prikazuje pomoć pri <naredba>."
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Command: /announce <msg>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** dostupno samo za GM ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Ova naredba šalje poruku <msg> svim igračima trenutno online."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Naredba: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Ova naredba briše chat log prethodnog chata."
-
-#: src/commandhandler.cpp:386
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Naredba: /item <policy>"
-
-#: src/commandhandler.cpp:387
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Ova naredba prikazuje broj igrača trenutno online."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Naredba: /join <channel>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Ova naredba vas unaša u <channel>."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Ako <channel> ne postoji, onda je napravljen."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Naredba: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Ova naredba prikazuje listu svih kanala."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Naredba: /me <message>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Ova naredba govori drugima da vi (radite) <msg>."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Naredba: /msg <nick> <message>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Naredba: /whisper <nick> <message>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Naredba: /w <nick> <message>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Ova naredba šalje tekst <message> za <nick>."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Ako <nick> ima razmake u sebi, zatvoriti ga u dvostrukim navodnicima (\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Naredba: /query <nick>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Naredba: /q <nick>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Ova naredba pokušava napraviti karticu za šaptanje između vas i <nick>."
-
-#: src/commandhandler.cpp:424
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Naredba: /w <nick> <message>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:427
-#, fuzzy
-msgid "Command: /away"
-msgstr "Naredba: /who"
-
-#: src/commandhandler.cpp:428
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Ova naredba postavlja temu za <message>."
-
-#: src/commandhandler.cpp:432
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Naredba: /create <ime-partije>"
-
-#: src/commandhandler.cpp:433
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Ove naredbe kreira novu partiju zvanu <party-name>."
-
-#: src/commandhandler.cpp:437
-#, fuzzy
-msgid "Command: /createguild <name>"
-msgstr "Naredba: /create <ime-partije>"
-
-#: src/commandhandler.cpp:438
-#, fuzzy
-msgid "This command creates a new guild called <name>."
-msgstr "Ove naredbe kreira novu partiju zvanu <party-name>."
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Naredba: /party <nick>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Ova naredba poziva <nick> na partiju sa vama."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Naredba: /present"
-
-#: src/commandhandler.cpp:450
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Naredba: /toggle <state>"
-
-#: src/commandhandler.cpp:456
-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:459
-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:462
-msgid "Command: /toggle"
-msgstr "Naredba: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr ""
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Naredba: /item <policy>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Naredba: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Ova naredba prikazuje naziv trenutne karte."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Naredba: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Ova naredba prikazuje broj igrača trenutno online."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Upišite /help za listu svih naredbi."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Ne mogu poslati prazan šapate!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -520,105 +139,105 @@ msgstr ""
 "Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to "
 "vi."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Zahtjev za pridruživanje kanalu %s."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Ime partije nedostaje."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Ime partije nedostaje."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "Poruka zatvara chat."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara chat."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 #, fuzzy
 msgid "friend"
 msgstr "Prijatelj"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 #, fuzzy
 msgid "disregarded"
 msgstr "Zanemareno"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 #, fuzzy
 msgid "neutral"
 msgstr "Neutralno"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Partija je uspješno kreirana."
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Partija je uspješno kreirana."
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -626,7 +245,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -634,7 +253,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -642,7 +261,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -650,7 +269,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -753,12 +372,12 @@ msgstr ""
 msgid "Reset"
 msgstr "Poništi"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Kupi"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -766,50 +385,52 @@ msgstr "Cijena: %s / Ukupno: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Max"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Trgovina"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Prodaj"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -965,7 +586,7 @@ msgstr "Odjavi"
 msgid "Change Email"
 msgstr "Promijeni Email Adresu"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -985,89 +606,89 @@ msgstr "Nivo: %d"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 #, fuzzy
 msgid "default"
 msgstr "Zadano"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr ""
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 #, fuzzy
 msgid "red"
 msgstr "Prijatelj"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 #, fuzzy
 msgid "green"
 msgstr "Zelena: "
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 #, fuzzy
 msgid "blue"
 msgstr "Plava: "
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr ""
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 #, fuzzy
 msgid "yellow"
 msgstr "nisko"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 #, fuzzy
 msgid "pink"
 msgstr "Hiperveza"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr ""
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr ""
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 msgid "brown"
 msgstr ""
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 #, fuzzy
 msgid "rainbow 1"
 msgstr "Duga"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 #, fuzzy
 msgid "rainbow 2"
 msgstr "Duga"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 #, fuzzy
 msgid "rainbow 3"
 msgstr "Duga"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d igrača je prisutno."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -1202,7 +823,7 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1219,11 +840,11 @@ msgstr "Oprema"
 msgid "Unequip"
 msgstr "Skini opremu"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Pomoć"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Zatvori"
@@ -1310,39 +931,39 @@ msgstr "Preuzmi"
 msgid "Drop"
 msgstr "Ispusti"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Sve"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Odaberi količinu predmeta za ispuštanje."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Odaberite količinu predmeta za spremanje."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Odaberite iznos predmeta za preuzimanje."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Odaberi količinu predmeta za razdvajanje."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 #, fuzzy
 msgid "Unknown."
 msgstr "Nepoznata greška"
@@ -1489,7 +1110,7 @@ msgstr "Zatvori"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Korisničko ime"
 
@@ -1511,11 +1132,11 @@ msgstr "Zapamti korisničko ime"
 msgid "Update:"
 msgstr ""
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
@@ -2011,56 +1632,56 @@ msgstr "Izaberite vaš server"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:229
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:246
 #, fuzzy
 msgid "Server type:"
 msgstr "Poslužitelj:"
 
-#: src/gui/serverdialog.cpp:232
-msgid "Use same ip for game sub servers"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Connect"
 msgstr "Spajanje..."
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 #, fuzzy
 msgid "Custom Server"
 msgstr "Vlastiti kursor"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Čekanje servera"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3576,34 +3197,34 @@ msgstr "Nemate dovoljno novca."
 msgid "Name: %s"
 msgstr "Ime: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Ažuriranje"
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Igraj"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces ažuriranja je nepotpun."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Vrlo je preporučljivo da"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  pokušate ponovno kasnije"
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Dovršeno"
 
@@ -3848,6 +3469,12 @@ msgstr "Naredba: /op <nadimak>"
 msgid "This command makes <nick> a channel operator."
 msgstr "Ova naredba čini <nadimak> operatorom kanala."
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+"Ako <nick> ima razmake u sebi, zatvoriti ga u dvostrukim navodnicima (\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "Kanal operatori mogu kick i op ostale korisnike iz kanala."
@@ -3912,6 +3539,11 @@ msgstr "Naredba: /item"
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Ova naredba prikazuje broj igrača trenutno online."
 
+#: src/gui/widgets/whispertab.cpp:128
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Naredba: /item <policy>"
+
 #: src/gui/widgets/whispertab.cpp:129
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
@@ -4463,7 +4095,7 @@ msgstr[1] "Pokupili ste %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 #, fuzzy
 msgid "You see "
 msgstr "Vi dobijete %s."
@@ -5091,20 +4723,20 @@ msgstr "Šapat nije mogao biti poslan, korisnik je offline."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 #, fuzzy
 msgid "MVP player."
 msgstr "Igrač"
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 #, fuzzy
 msgid "MVP player: "
 msgstr "Igrač"
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Kanali nisu podržani!"
 
@@ -5397,6 +5029,10 @@ msgstr ""
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Ova naredba poziva <nick> na partiju sa vama."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr ""
@@ -5873,6 +5509,213 @@ msgstr "Mana %+d"
 msgid "Unknown item"
 msgstr "Nepoznati predmet"
 
+#~ msgid "-- Help --"
+#~ msgstr "-- Pomoć --"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Prikaži ovu pomoć"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Prikaži ime karte"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Prikaži broj trenutno prijavljenih korisnika"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Recite nešto o sebi"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Očisti ovaj prozor"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Pošaljite privatnu poruku korisniku"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > Alias za msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > Alias za msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr "/query > Čini karticu za privatne poruke s drugim korisnikom"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > Alias od query"
+
+#, fuzzy
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/close > Zatvara karticu za šaptaje"
+
+#, fuzzy
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "@@disregard|Zanemari %s@@"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Prikaži sve javne kanale"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Pridruži se ili napravi kanal"
+
+#, fuzzy
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/create > Napravi novu partiju"
+
+#, fuzzy
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/create > Napravi novu partiju"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Pozovite korisnike na partiju"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Globalna obavijest (samo GM)"
+
+#, fuzzy
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/close > Zatvara karticu za šaptaje"
+
+#, fuzzy
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/msg > Pošaljite privatnu poruku korisniku"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Za više informacija, utipkajte /pomoć <naredba>."
+
+#~ msgid "Command: /help"
+#~ msgstr "Naredba: /pomoć"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Ova naredba prikazuje listu svih raspoloživih naredbi."
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Naredba: /pomoć <naredba>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Ova naredba prikazuje pomoć pri <naredba>."
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Command: /announce <msg>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** dostupno samo za GM ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr "Ova naredba šalje poruku <msg> svim igračima trenutno online."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Naredba: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Ova naredba briše chat log prethodnog chata."
+
+#, fuzzy
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Naredba: /item <policy>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr "Ova naredba prikazuje broj igrača trenutno online."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Naredba: /join <channel>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Ova naredba vas unaša u <channel>."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Ako <channel> ne postoji, onda je napravljen."
+
+#~ msgid "Command: /list"
+#~ msgstr "Naredba: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Ova naredba prikazuje listu svih kanala."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Naredba: /me <message>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Ova naredba govori drugima da vi (radite) <msg>."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Naredba: /msg <nick> <message>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Naredba: /whisper <nick> <message>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Naredba: /w <nick> <message>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Ova naredba šalje tekst <message> za <nick>."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Naredba: /query <nick>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Naredba: /q <nick>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Ova naredba pokušava napraviti karticu za šaptanje između vas i <nick>."
+
+#, fuzzy
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Naredba: /w <nick> <message>"
+
+#, fuzzy
+#~ msgid "Command: /away"
+#~ msgstr "Naredba: /who"
+
+#, fuzzy
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Ova naredba postavlja temu za <message>."
+
+#, fuzzy
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Naredba: /create <ime-partije>"
+
+#, fuzzy
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Ove naredbe kreira novu partiju zvanu <party-name>."
+
+#, fuzzy
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Naredba: /create <ime-partije>"
+
+#, fuzzy
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Ove naredbe kreira novu partiju zvanu <party-name>."
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Naredba: /party <nick>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Naredba: /present"
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Naredba: /toggle <state>"
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Naredba: /toggle"
+
+#~ msgid "Command: /where"
+#~ msgstr "Naredba: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Ova naredba prikazuje naziv trenutne karte."
+
+#~ msgid "Command: /who"
+#~ msgstr "Naredba: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Ova naredba prikazuje broj igrača trenutno online."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Upišite /help za listu svih naredbi."
+
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Detalji Čestica"
diff --git a/po/hu.po b/po/hu.po
index 86a994605..9c7c5d922 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -60,10 +60,10 @@ msgstr "Csatlakozás a térkép szerverhez...."
 msgid "Changing game servers"
 msgstr "Szerver"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -102,429 +102,34 @@ msgstr "Regisztráció megszüntetése"
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Helytelen frissítési kiszolgáló: "
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Ismeretlen parancs."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "-- Segítség --"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Megmutatja ezt a segítséget"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Megmutatja a térkép nevét"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Megmutatja az online felhasználókat"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Mondasz valamit magadról"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Letörli ezt az ablakot"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Privát üzenetet küld egy felhasználónak"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > msg megfelelője"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > msg megfelelője"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Fület hoz létre privát beszélgetéshez"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > query megfelelője"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:322
-#, fuzzy
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/close > Bezárja a privát fület."
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr ""
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr ""
-
-#: src/commandhandler.cpp:325
-#, fuzzy
-msgid "/disregard > Disregard a player"
-msgstr "@@disregard|Semmibe veszed %s-t@@"
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr ""
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Publikus csatornák listázása"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Csatornához kapcsolódás/csatornát létrehoz"
-
-#: src/commandhandler.cpp:331
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Új csapat létrehozása"
-
-#: src/commandhandler.cpp:332
-#, fuzzy
-msgid "/createguild > Create a new guild"
-msgstr "/create > Új csapat létrehozása"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Felhasználó csapatba hívása"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-"/toggle > Választható, hogy üres <enter> kell e az input panel bezárásához"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr "/present > \"Hallható\" játékosok kilistázása"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globális üzenet (csak GM)"
-
-#: src/commandhandler.cpp:342
-#, fuzzy
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/close > Bezárja a privát fület."
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr ""
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr ""
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr ""
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr ""
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr ""
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr ""
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr ""
-
-#: src/commandhandler.cpp:354
-#, fuzzy
-msgid "/mail > Send offline message to player"
-msgstr "/msg > Privát üzenetet küld egy felhasználónak"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "További információhoz gépeld be a /help <parancsnév> parancsot."
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Parancs: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Ez a parancs az elérhető parancsokat listázza."
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Parancs: /help <parancsnév>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr ""
-"Ez a parancs segítséget nyújt a <parancsnév> alatt megadott parancshoz."
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Parancs: /announce <üzenet>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** csak GM-nek elérhető ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Ez a parancs az <üzenet>-en belül megadott szöveget elküldi az összes "
-"elérhető játékosnak."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Parancs: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Törli a beszélgetés panel tartalmát."
-
-#: src/commandhandler.cpp:386
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Parancs: /item <szabály>"
-
-#: src/commandhandler.cpp:387
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Ez a parancs megmutatja az online játékosok számát."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Parancs: /join <csatorna>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Belépsz a <csatorna> helyen megadott beszélgetési csatornába."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Ha a <csatorna> helyen megadott csatorna nem létezik, létrehozod."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Parancs: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Kilistázza az összes csatornát."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Parancs: /me <üzenet>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Ezzel a paranccsal az állapotodat jelzed. Megjelenés: Név <üzenet>"
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Parancs: /msg <név> <üzenet>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Parancs: /whisper <név> <üzenet>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Parancs: /w <név> <üzenet>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr ""
-"Ez a parancs elküldi az <üzenet> szövegét a <név> alatt megadott nevű "
-"játékosnak."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Ha a <név> alatt megadott név szóközt tartalmaz idézőjelbe kell tenni. (\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Parancs: /query <név>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Parancs: /q <név>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Ez a parancs egy új fület nyit beszélgetéseidhez a <név> alatt megadott nevű "
-"játékossal."
-
-#: src/commandhandler.cpp:424
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Parancs: /w <név> <üzenet>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:427
-#, fuzzy
-msgid "Command: /away"
-msgstr "Parancs: /who"
-
-#: src/commandhandler.cpp:428
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Ez a parancs beállítja a témát a <téma> alatt megadott szövegre."
-
-#: src/commandhandler.cpp:432
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Parancs: /create <csapatnév>"
-
-#: src/commandhandler.cpp:433
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr ""
-"Ezek a parancsok új csapatot hoznak létre a <csapatnév> alatt megadott néven."
-
-#: src/commandhandler.cpp:437
-#, fuzzy
-msgid "Command: /createguild <name>"
-msgstr "Parancs: /create <csapatnév>"
-
-#: src/commandhandler.cpp:438
-#, fuzzy
-msgid "This command creates a new guild called <name>."
-msgstr ""
-"Ezek a parancsok új csapatot hoznak létre a <csapatnév> alatt megadott néven."
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Parancs: /party <név>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Ez a parancs csapatba hívja a <név> alatt megadott nevű játékost."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Parancs: /present"
-
-#: src/commandhandler.cpp:450
-#, fuzzy
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"Ez a parancs megmutatja a \"hallható\" játékosok nevét és fájlba is rögzíti, "
-"ha éppen rögzítjük a beszélgetést."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Parancs: /toggle <állás>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr "Ez a parancs beállítja az enter billentyű használatát a játékban."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<állás> lehet \"1\", \"yes\", \"true\" ha ki akarod kapcsolni a chat input "
-"automatikus eltűnését, \"0\", \"no\", \"false\"  ha nem."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Parancs: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "A /toggle jelenlegi állását mutatja meg."
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Parancs: /item <szabály>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Parancs: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Ez a parancs megmutatja az aktuális térkép nevét."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Parancs: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Ez a parancs megmutatja az online játékosok számát."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Parancsok listája: /help"
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Nem küldhetsz üres üzenetet!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -532,133 +137,133 @@ msgid ""
 msgstr ""
 "Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "A csapatnév hiányzik."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "A csapatnév hiányzik."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "Az enter megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "Az üzenet bezárja a bevitelt."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "Az enter mostantól megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Az üzenet mostantól bezárja a bevitelt."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 #, fuzzy
 msgid "friend"
 msgstr "Barát"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 #, fuzzy
 msgid "disregarded"
 msgstr "Semmibevett"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 #, fuzzy
 msgid "neutral"
 msgstr "Semleges"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Csapat létrehozása sikeres."
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 #, fuzzy
 msgid "Player already erased!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Csapat létrehozása sikeres."
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -762,12 +367,12 @@ msgstr ""
 msgid "Reset"
 msgstr "Alaphelyzet"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Vétel"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -775,50 +380,52 @@ msgstr "Ár: %s / Teljes: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Max."
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Üzlet"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Eladás"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -974,7 +581,7 @@ msgstr "Regisztráció megszüntetése"
 msgid "Change Email"
 msgstr "Email cím módosírása"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -994,90 +601,90 @@ msgstr "Szint: %d"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 #, fuzzy
 msgid "default"
 msgstr "Alapértelmezett"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr ""
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 #, fuzzy
 msgid "red"
 msgstr "Barát"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 #, fuzzy
 msgid "green"
 msgstr "Zöld: "
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 #, fuzzy
 msgid "blue"
 msgstr "Kék: "
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr ""
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 #, fuzzy
 msgid "yellow"
 msgstr "alacsony"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 #, fuzzy
 msgid "pink"
 msgstr "Hiperlink"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr ""
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr ""
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 #, fuzzy
 msgid "brown"
 msgstr "Dobófegyver"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 #, fuzzy
 msgid "rainbow 1"
 msgstr "Szivárvány"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 #, fuzzy
 msgid "rainbow 2"
 msgstr "Szivárvány"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 #, fuzzy
 msgid "rainbow 3"
 msgstr "Szivárvány"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d játékos van a közeledben."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
@@ -1212,7 +819,7 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1229,11 +836,11 @@ msgstr "Felszerelés"
 msgid "Unequip"
 msgstr "Nem használ"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Súgó"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Bezár"
@@ -1320,39 +927,39 @@ msgstr "Magához vesz"
 msgid "Drop"
 msgstr "Eldob"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Mind"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Válaszd ki mennyit akarsz eldobni."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Válaszd ki a raktározandó mennyiséget."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Válaszd ki mennyit veszel magadhoz."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Válaszd ki az elosztandó mennyiséget."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 #, fuzzy
 msgid "Unknown."
 msgstr "Ismeretlen hiba"
@@ -1499,7 +1106,7 @@ msgstr "Bezár"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Belépés"
 
@@ -1521,11 +1128,11 @@ msgstr "Felhasználónév megjegyzése"
 msgid "Update:"
 msgstr ""
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Regisztráció"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 #, fuzzy
 msgid "Change Server"
 msgstr "Szerver"
@@ -2021,56 +1628,56 @@ msgstr "Válassz szervert"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:229
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:246
 #, fuzzy
 msgid "Server type:"
 msgstr "Szerver:"
 
-#: src/gui/serverdialog.cpp:232
-msgid "Use same ip for game sub servers"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Connect"
 msgstr "Csatlakozás…"
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 #, fuzzy
 msgid "Custom Server"
 msgstr "Egyéni kurzor"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Kérlek írd be a szerver címét és portját egyaránt."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Várakozás a szerverre"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3589,34 +3196,34 @@ msgstr "Nincs elég pénzed."
 msgid "Name: %s"
 msgstr "Név: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Frissítés…"
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Csatlakozás…"
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Játék"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1 A frissítési folyamat befejezetlen"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Erősen ajánljuk, hogy"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 próbáld meg később"
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Kész"
 
@@ -3862,6 +3469,12 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 "Ez a parancs a <név> alatt megadott személyt csatorna operátorrá teszi."
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+"Ha a <név> alatt megadott név szóközt tartalmaz idézőjelbe kell tenni. (\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "A csatorna operátor parancsai: /kick /op"
@@ -3926,6 +3539,11 @@ msgstr "Parancs: /item"
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Ez a parancs megmutatja az online játékosok számát."
 
+#: src/gui/widgets/whispertab.cpp:128
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Parancs: /item <szabály>"
+
 #: src/gui/widgets/whispertab.cpp:129
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
@@ -4480,7 +4098,7 @@ msgstr[1] "Zsákmányod%s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 #, fuzzy
 msgid "You see "
 msgstr "Kapott tárgy: %s."
@@ -5112,20 +4730,20 @@ msgstr "A privát üzenet nem lett elküldve, mert a játékos nem elérhető."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 #, fuzzy
 msgid "MVP player."
 msgstr "Játékos"
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 #, fuzzy
 msgid "MVP player: "
 msgstr "Játékos"
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "A csatornák le vannak tiltva!"
 
@@ -5419,6 +5037,10 @@ msgstr "/item > Tárgyak elosztását nézhetjük/átállíthatjuk vele"
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Tapasztalat elosztását nézhetjük/átállíthatjuk vele"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Ez a parancs csapatba hívja a <név> alatt megadott nevű játékost."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Ezzel a paranccsal a játékos elhagyja a csapatát."
@@ -5902,6 +5524,254 @@ msgstr "Varázserő %+d"
 msgid "Unknown item"
 msgstr "Ismeretlen tárgy"
 
+#~ msgid "-- Help --"
+#~ msgstr "-- Segítség --"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Megmutatja ezt a segítséget"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Megmutatja a térkép nevét"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Megmutatja az online felhasználókat"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Mondasz valamit magadról"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Letörli ezt az ablakot"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Privát üzenetet küld egy felhasználónak"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > msg megfelelője"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > msg megfelelője"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr "/query > Fület hoz létre privát beszélgetéshez"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > query megfelelője"
+
+#, fuzzy
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/close > Bezárja a privát fület."
+
+#, fuzzy
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "@@disregard|Semmibe veszed %s-t@@"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Publikus csatornák listázása"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Csatornához kapcsolódás/csatornát létrehoz"
+
+#, fuzzy
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/create > Új csapat létrehozása"
+
+#, fuzzy
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/create > Új csapat létrehozása"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Felhasználó csapatba hívása"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr ""
+#~ "/toggle > Választható, hogy üres <enter> kell e az input panel bezárásához"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr "/present > \"Hallható\" játékosok kilistázása"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Globális üzenet (csak GM)"
+
+#, fuzzy
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/close > Bezárja a privát fület."
+
+#, fuzzy
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/msg > Privát üzenetet küld egy felhasználónak"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "További információhoz gépeld be a /help <parancsnév> parancsot."
+
+#~ msgid "Command: /help"
+#~ msgstr "Parancs: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Ez a parancs az elérhető parancsokat listázza."
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Parancs: /help <parancsnév>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr ""
+#~ "Ez a parancs segítséget nyújt a <parancsnév> alatt megadott parancshoz."
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Parancs: /announce <üzenet>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** csak GM-nek elérhető ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr ""
+#~ "Ez a parancs az <üzenet>-en belül megadott szöveget elküldi az összes "
+#~ "elérhető játékosnak."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Parancs: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Törli a beszélgetés panel tartalmát."
+
+#, fuzzy
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Parancs: /item <szabály>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr "Ez a parancs megmutatja az online játékosok számát."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Parancs: /join <csatorna>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Belépsz a <csatorna> helyen megadott beszélgetési csatornába."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Ha a <csatorna> helyen megadott csatorna nem létezik, létrehozod."
+
+#~ msgid "Command: /list"
+#~ msgstr "Parancs: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Kilistázza az összes csatornát."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Parancs: /me <üzenet>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Ezzel a paranccsal az állapotodat jelzed. Megjelenés: Név <üzenet>"
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Parancs: /msg <név> <üzenet>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Parancs: /whisper <név> <üzenet>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Parancs: /w <név> <üzenet>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr ""
+#~ "Ez a parancs elküldi az <üzenet> szövegét a <név> alatt megadott nevű "
+#~ "játékosnak."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Parancs: /query <név>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Parancs: /q <név>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Ez a parancs egy új fület nyit beszélgetéseidhez a <név> alatt megadott "
+#~ "nevű játékossal."
+
+#, fuzzy
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Parancs: /w <név> <üzenet>"
+
+#, fuzzy
+#~ msgid "Command: /away"
+#~ msgstr "Parancs: /who"
+
+#, fuzzy
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Ez a parancs beállítja a témát a <téma> alatt megadott szövegre."
+
+#, fuzzy
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Parancs: /create <csapatnév>"
+
+#, fuzzy
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr ""
+#~ "Ezek a parancsok új csapatot hoznak létre a <csapatnév> alatt megadott "
+#~ "néven."
+
+#, fuzzy
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Parancs: /create <csapatnév>"
+
+#, fuzzy
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr ""
+#~ "Ezek a parancsok új csapatot hoznak létre a <csapatnév> alatt megadott "
+#~ "néven."
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Parancs: /party <név>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Parancs: /present"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "Ez a parancs megmutatja a \"hallható\" játékosok nevét és fájlba is "
+#~ "rögzíti, ha éppen rögzítjük a beszélgetést."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Parancs: /toggle <állás>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr "Ez a parancs beállítja az enter billentyű használatát a játékban."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<állás> lehet \"1\", \"yes\", \"true\" ha ki akarod kapcsolni a chat "
+#~ "input automatikus eltűnését, \"0\", \"no\", \"false\"  ha nem."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Parancs: /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "A /toggle jelenlegi állását mutatja meg."
+
+#~ msgid "Command: /where"
+#~ msgstr "Parancs: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Ez a parancs megmutatja az aktuális térkép nevét."
+
+#~ msgid "Command: /who"
+#~ msgstr "Parancs: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Ez a parancs megmutatja az online játékosok számát."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Parancsok listája: /help"
+
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Effektek részletessége"
diff --git a/po/it.po b/po/it.po
index 3f7deaf77..188870293 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2010-02-18 14:01+0000\n"
 "Last-Translator: Gabriel Rota <gabriel.rota@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -62,10 +62,10 @@ msgstr "Connessione al server della mappa..."
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -103,424 +103,34 @@ msgstr "Cancella registrazione"
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Host di aggiornamento non valido: "
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "-- Aiuto --"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Mostra questo aiuto"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Mostra il nome della mappa"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Mostra il numero di utenti in linea"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Scrivi un messaggio riguardante te"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Pulisce questa finestra"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Invia un messaggio privato ad un utente"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Equivale a \"msg\""
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > Equivale a \"msg\""
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Apre una scheda per i messaggi privati con un altro utente"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > Equivale a \"query\""
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:322
-#, fuzzy
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/close > Chiude la scheda del sussurro"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr ""
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr ""
-
-#: src/commandhandler.cpp:325
-#, fuzzy
-msgid "/disregard > Disregard a player"
-msgstr "@@disregard|Disprezza %s@@"
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr ""
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Mostra tutti i canali pubblici"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Partecipa o crea un canale"
-
-#: src/commandhandler.cpp:331
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Crea un nuovo party"
-
-#: src/commandhandler.cpp:332
-#, fuzzy
-msgid "/createguild > Create a new guild"
-msgstr "/create > Crea un nuovo party"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Invita un utente nel party"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Determina se <invio> apre/chiude il registro della chat"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Ottiene una lista dei giocatori presenti (inviato al registro di "
-"chat, se è attivo)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Annuncio globale (solo GM)"
-
-#: src/commandhandler.cpp:342
-#, fuzzy
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/close > Chiude la scheda del sussurro"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr ""
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr ""
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr ""
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr ""
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr ""
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr ""
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr ""
-
-#: src/commandhandler.cpp:354
-#, fuzzy
-msgid "/mail > Send offline message to player"
-msgstr "/msg > Invia un messaggio privato ad un utente"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Per maggiori informazioni, digitare /help <comando>."
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Comando: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Questo comando mostra una lista di tutti i comandi disponibili."
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Comando: /help <comando>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Questo comando mostra l'aiuto per <comando>."
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Comando: /announce <msg>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** disponibile solo ai GM ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Questo comando invia un messaggio <msg> a tutti i giocatori in linea."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Comando: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Questo comando pulisce il registro della chat precedente"
-
-#: src/commandhandler.cpp:386
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Comando: /item <politica>"
-
-#: src/commandhandler.cpp:387
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Comando: /join <canale>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Questo comando effettua l'accesso al <canale> specificato."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Se il <canale> non esiste, viene creato."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Comando: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Questo comando mostra una lista di tutti i canali."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Comando: /me <messaggio>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Questo comando mostra agli altri ciò che stai <messaggio>."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Comando: /msg <nick> <messaggio>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Comando: /whisper <nick> <messaggio>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Comando: /w <nick> <messaggio>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Questo comando invia il testo <messaggio> all'utente <nick>."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Se il <nick> contiene spazi, racchiuderlo tra virgolette (\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Comando: /query <nick>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Comando: /q <nick>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Questo comando tenta di creare una scheda per i sussurri tra te e l'utente "
-"<nick>."
-
-#: src/commandhandler.cpp:424
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Comando: /w <nick> <messaggio>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:427
-#, fuzzy
-msgid "Command: /away"
-msgstr "Comando: /who"
-
-#: src/commandhandler.cpp:428
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Questo comando imposta l'argomento a <messaggio>"
-
-#: src/commandhandler.cpp:432
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Comando: /create <nome-gruppo>"
-
-#: src/commandhandler.cpp:433
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Questi comandi creano un nuovo gruppo chiamato <nome-gruppo>."
-
-#: src/commandhandler.cpp:437
-#, fuzzy
-msgid "Command: /createguild <name>"
-msgstr "Comando: /create <nome-gruppo>"
-
-#: src/commandhandler.cpp:438
-#, fuzzy
-msgid "This command creates a new guild called <name>."
-msgstr "Questi comandi creano un nuovo gruppo chiamato <nome-gruppo>."
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Comando: /party <nick>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Questo comando invita <nick> nel tuo party."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Comando: /present"
-
-#: src/commandhandler.cpp:450
-#, fuzzy
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"Questo comando crea una lista dei giocatori che hai attorno e la invia o "
-"alla registrazione della chat se attivata, o alla chat altrimenti."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Comando: /toggle <stato>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Questo comando imposta la chiusura del registro della conversazione premendo "
-"il tasto Invio oppure automaticamente."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<stato> può essere \"1\", \"yes\", \"true\" per attivarlo, oppure \"0\", \"no"
-"\", \"false\" per disattivarlo."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Comando: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "Questo comando mostra se il tasto Invio è attivato o meno."
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Comando: /item <politica>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Comando: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Questo comando mostra il nome della mappa attuale."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Comando: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Digitare /help per una lista dei comandi."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Impossibile inviare un sussurro vuoto!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -529,133 +139,133 @@ msgstr ""
 "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
 "sei tu."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Richiesta per accedere al canale %s."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Manca il nome del party."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "Invio attiva/disattiva la conversazione."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "I messaggi chiudono la conversazione."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "\"Invio\" adesso attiva/disattiva la conversazione."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la conversazione."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 #, fuzzy
 msgid "friend"
 msgstr "Amico"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 #, fuzzy
 msgid "disregarded"
 msgstr "Disprezzato"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 #, fuzzy
 msgid "neutral"
 msgstr "Neutrale"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Party creato con successo."
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Party creato con successo."
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -759,12 +369,12 @@ msgstr ""
 msgid "Reset"
 msgstr "Reimposta"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Compra"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -772,50 +382,52 @@ msgstr "Prezzo: %s / Totale: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Esci"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Massimo"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Negozio"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Vendi"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -971,7 +583,7 @@ msgstr "Cancella registrazione"
 msgid "Change Email"
 msgstr "Cambia l'indirizzo Email"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -991,90 +603,90 @@ msgstr "Livello: %d"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 #, fuzzy
 msgid "default"
 msgstr "Predefinito"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr ""
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 #, fuzzy
 msgid "red"
 msgstr "Amico"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 #, fuzzy
 msgid "green"
 msgstr "Verde: "
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 #, fuzzy
 msgid "blue"
 msgstr "Blu: "
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr ""
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 #, fuzzy
 msgid "yellow"
 msgstr "Basso"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 #, fuzzy
 msgid "pink"
 msgstr "Collegamento ipertestuale"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr ""
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr ""
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 #, fuzzy
 msgid "brown"
 msgstr "Deviato"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 #, fuzzy
 msgid "rainbow 1"
 msgstr "Arcobaleno"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 #, fuzzy
 msgid "rainbow 2"
 msgstr "Arcobaleno"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 #, fuzzy
 msgid "rainbow 3"
 msgstr "Arcobaleno"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Sono presenti %d giocatori."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -1209,7 +821,7 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1226,11 +838,11 @@ msgstr "Equipaggiamento"
 msgid "Unequip"
 msgstr "Rimuovi"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Chiudi"
@@ -1316,39 +928,39 @@ msgstr "Recupera"
 msgid "Drop"
 msgstr "Lascia"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tutti"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Selezionare la quantità di oggetti da riporre."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Seleziona la quantità di oggetti da ritirare"
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da dividere."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 #, fuzzy
 msgid "Unknown."
 msgstr "Errore sconosciuto"
@@ -1495,7 +1107,7 @@ msgstr "Chiudi"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Autenticazione"
 
@@ -1517,11 +1129,11 @@ msgstr "Ricorda nome utente"
 msgid "Update:"
 msgstr ""
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Registra"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
@@ -2014,56 +1626,56 @@ msgstr "Scegliere il proprio server"
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:229
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:246
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:232
-msgid "Use same ip for game sub servers"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Connect"
 msgstr "Connessione..."
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 #, fuzzy
 msgid "Custom Server"
 msgstr "Cursore personalizzato"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Per favore inserisci l'indirizzo e la porta del server."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "In attesa del server"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3582,34 +3194,34 @@ msgstr "Non hai abbastanza denaro."
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Aggiornamento..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Gioca"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1 L'aggiornamento è stato completato."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 prova più tardi"
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Completato"
 
@@ -3855,6 +3467,11 @@ msgstr "Comando: /op <nick>"
 msgid "This command makes <nick> a channel operator."
 msgstr "Questo comando rende <nick> un operatore del canale"
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Se il <nick> contiene spazi, racchiuderlo tra virgolette (\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3921,6 +3538,11 @@ msgstr "Comando: /item"
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
 
+#: src/gui/widgets/whispertab.cpp:128
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Comando: /item <politica>"
+
 #: src/gui/widgets/whispertab.cpp:129
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
@@ -4473,7 +4095,7 @@ msgstr[1] "Hai raccolto %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 #, fuzzy
 msgid "You see "
 msgstr "Hai ottenuto %s"
@@ -5104,20 +4726,20 @@ msgstr "Il bisbiglio non può essere inviato, l'utente è offline."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 #, fuzzy
 msgid "MVP player."
 msgstr "Giocatore"
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 #, fuzzy
 msgid "MVP player: "
 msgstr "Giocatore"
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "I canali non sono supportati!"
 
@@ -5412,6 +5034,10 @@ msgstr ""
 "/item > Mostra/modifica le opzioni di condivisione dei punti esperienza nel "
 "gruppo"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Questo comando invita <nick> nel tuo party."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Questo comando fa abbandonare il gruppo ad un giocatore."
@@ -5892,6 +5518,249 @@ msgstr "PM %+d"
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
+#~ msgid "-- Help --"
+#~ msgstr "-- Aiuto --"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Mostra questo aiuto"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Mostra il nome della mappa"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Mostra il numero di utenti in linea"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Scrivi un messaggio riguardante te"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Pulisce questa finestra"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Invia un messaggio privato ad un utente"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > Equivale a \"msg\""
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > Equivale a \"msg\""
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr "/query > Apre una scheda per i messaggi privati con un altro utente"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > Equivale a \"query\""
+
+#, fuzzy
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/close > Chiude la scheda del sussurro"
+
+#, fuzzy
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "@@disregard|Disprezza %s@@"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Mostra tutti i canali pubblici"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Partecipa o crea un canale"
+
+#, fuzzy
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/create > Crea un nuovo party"
+
+#, fuzzy
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/create > Crea un nuovo party"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Invita un utente nel party"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr "/toggle > Determina se <invio> apre/chiude il registro della chat"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Ottiene una lista dei giocatori presenti (inviato al registro "
+#~ "di chat, se è attivo)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Annuncio globale (solo GM)"
+
+#, fuzzy
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/close > Chiude la scheda del sussurro"
+
+#, fuzzy
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/msg > Invia un messaggio privato ad un utente"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Per maggiori informazioni, digitare /help <comando>."
+
+#~ msgid "Command: /help"
+#~ msgstr "Comando: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Questo comando mostra una lista di tutti i comandi disponibili."
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Comando: /help <comando>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Questo comando mostra l'aiuto per <comando>."
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Comando: /announce <msg>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** disponibile solo ai GM ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr ""
+#~ "Questo comando invia un messaggio <msg> a tutti i giocatori in linea."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Comando: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Questo comando pulisce il registro della chat precedente"
+
+#, fuzzy
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Comando: /item <politica>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Comando: /join <canale>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Questo comando effettua l'accesso al <canale> specificato."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Se il <canale> non esiste, viene creato."
+
+#~ msgid "Command: /list"
+#~ msgstr "Comando: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Questo comando mostra una lista di tutti i canali."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Comando: /me <messaggio>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Questo comando mostra agli altri ciò che stai <messaggio>."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Comando: /msg <nick> <messaggio>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Comando: /whisper <nick> <messaggio>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Comando: /w <nick> <messaggio>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Questo comando invia il testo <messaggio> all'utente <nick>."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Comando: /query <nick>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Comando: /q <nick>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Questo comando tenta di creare una scheda per i sussurri tra te e "
+#~ "l'utente <nick>."
+
+#, fuzzy
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Comando: /w <nick> <messaggio>"
+
+#, fuzzy
+#~ msgid "Command: /away"
+#~ msgstr "Comando: /who"
+
+#, fuzzy
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Questo comando imposta l'argomento a <messaggio>"
+
+#, fuzzy
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Comando: /create <nome-gruppo>"
+
+#, fuzzy
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Questi comandi creano un nuovo gruppo chiamato <nome-gruppo>."
+
+#, fuzzy
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Comando: /create <nome-gruppo>"
+
+#, fuzzy
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Questi comandi creano un nuovo gruppo chiamato <nome-gruppo>."
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Comando: /party <nick>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Comando: /present"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "Questo comando crea una lista dei giocatori che hai attorno e la invia o "
+#~ "alla registrazione della chat se attivata, o alla chat altrimenti."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Comando: /toggle <stato>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr ""
+#~ "Questo comando imposta la chiusura del registro della conversazione "
+#~ "premendo il tasto Invio oppure automaticamente."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<stato> può essere \"1\", \"yes\", \"true\" per attivarlo, oppure \"0\", "
+#~ "\"no\", \"false\" per disattivarlo."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Comando: /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "Questo comando mostra se il tasto Invio è attivato o meno."
+
+#~ msgid "Command: /where"
+#~ msgstr "Comando: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Questo comando mostra il nome della mappa attuale."
+
+#~ msgid "Command: /who"
+#~ msgstr "Comando: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Digitare /help per una lista dei comandi."
+
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Dettagli particelle"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 562c6ada2..d68f26180 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\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"
@@ -54,10 +54,10 @@ msgstr ""
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -92,522 +92,159 @@ msgstr ""
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr ""
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr ""
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr ""
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr ""
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr ""
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr ""
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr ""
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr ""
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:322
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr ""
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr ""
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr ""
-
-#: src/commandhandler.cpp:325
-msgid "/disregard > Disregard a player"
-msgstr ""
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr ""
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr ""
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr ""
-
-#: src/commandhandler.cpp:331
-msgid "/createparty > Create a new party"
-msgstr ""
-
-#: src/commandhandler.cpp:332
-msgid "/createguild > Create a new guild"
-msgstr ""
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr ""
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr ""
-
-#: src/commandhandler.cpp:342
-msgid "/closeall > Close all opened whisper tabs"
-msgstr ""
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr ""
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr ""
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr ""
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr ""
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr ""
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr ""
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr ""
-
-#: src/commandhandler.cpp:354
-msgid "/mail > Send offline message to player"
-msgstr ""
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr ""
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr ""
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr ""
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr ""
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr ""
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr ""
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr ""
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr ""
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr ""
-
-#: src/commandhandler.cpp:386
-msgid "Command: /ignore <player>"
-msgstr ""
-
-#: src/commandhandler.cpp:387
-msgid "This command ignores the given player regardless of current relations."
-msgstr ""
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr ""
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr ""
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr ""
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr ""
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr ""
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr ""
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr ""
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr ""
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr ""
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-
-#: src/commandhandler.cpp:424
-msgid "Command: /away <afk reason>"
-msgstr ""
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:427
-msgid "Command: /away"
-msgstr ""
-
-#: src/commandhandler.cpp:428
-msgid "This command clears the away status and message."
-msgstr ""
-
-#: src/commandhandler.cpp:432
-msgid "Command: /createparty <name>"
-msgstr ""
-
-#: src/commandhandler.cpp:433
-msgid "This command creates a new party called <name>."
-msgstr ""
-
-#: src/commandhandler.cpp:437
-msgid "Command: /createguild <name>"
-msgstr ""
-
-#: src/commandhandler.cpp:438
-msgid "This command creates a new guild called <name>."
-msgstr ""
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr ""
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr ""
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr ""
-
-#: src/commandhandler.cpp:450
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr ""
-
-#: src/commandhandler.cpp:456
-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:459
-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:462
-msgid "Command: /toggle"
-msgstr ""
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr ""
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-msgid "Command: /unignore <player>"
-msgstr ""
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr ""
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr ""
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr ""
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr ""
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr ""
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -704,12 +341,12 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -717,50 +354,52 @@ msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr ""
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr ""
 
@@ -910,7 +549,7 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -929,80 +568,80 @@ msgstr ""
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 msgid "default"
 msgstr ""
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr ""
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 msgid "red"
 msgstr ""
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 msgid "green"
 msgstr ""
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 msgid "blue"
 msgstr ""
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr ""
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 msgid "pink"
 msgstr ""
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr ""
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr ""
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 msgid "brown"
 msgstr ""
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr ""
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1126,7 +765,7 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1143,11 +782,11 @@ msgstr ""
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr ""
@@ -1230,39 +869,39 @@ msgstr ""
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
@@ -1401,7 +1040,7 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr ""
 
@@ -1422,11 +1061,11 @@ msgstr ""
 msgid "Update:"
 msgstr ""
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 msgid "Change Server"
 msgstr ""
 
@@ -1874,52 +1513,52 @@ msgstr ""
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:229
-msgid "Server type:"
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:232
-msgid "Use same ip for game sub servers"
+#: src/gui/serverdialog.cpp:246
+msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3358,33 +2997,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr ""
 
@@ -3612,6 +3251,11 @@ msgstr ""
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3674,6 +3318,10 @@ msgstr ""
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
+#: src/gui/widgets/whispertab.cpp:128
+msgid "Command: /unignore <player>"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:129
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
@@ -4192,7 +3840,7 @@ msgstr[1] ""
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 msgid "You see "
 msgstr ""
 
@@ -4769,18 +4417,18 @@ msgstr ""
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -5046,6 +4694,10 @@ msgstr ""
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 3ee6ae865..036656bed 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -60,10 +60,10 @@ msgstr "Verbinden met de map server..."
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -102,556 +102,166 @@ msgstr "Registreren"
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige updatahost: "
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "-- Help --"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Deze help weergeven"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Mapnaam weergeven"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Aantal online gebruikers weergeven"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Vertel iets over jezelf"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Maak dit venster leeg"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Zend een privébericht naar een gebruiker"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > zelfde functie als msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > zelfde als msg"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Maakt een tabblad voor privéberichten met andere gebruikers"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > zelfde functie als query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:322
-#, fuzzy
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/close > Sluit de fluistertab"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr ""
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr ""
-
-#: src/commandhandler.cpp:325
-msgid "/disregard > Disregard a player"
-msgstr ""
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr ""
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Alle publieke kanalen weergeven"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Een kanaal creëren of bij aansluiten"
-
-#: src/commandhandler.cpp:331
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Creëer een nieuwe groep"
-
-#: src/commandhandler.cpp:332
-#, fuzzy
-msgid "/createguild > Create a new guild"
-msgstr "/create > Creëer een nieuwe groep"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Een gebruiker uitnodigen in de groep"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Bepalen of <return> de chatlog wisselt"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Lijst weergeven met alle aanwezige spelers (opgeslagen in "
-"chatlog, als logging aanstaat)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globale aankondiging (enkel GM)"
-
-#: src/commandhandler.cpp:342
-#, fuzzy
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/close > Sluit de fluistertab"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr ""
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr ""
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr ""
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr ""
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr ""
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr ""
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr ""
-
-#: src/commandhandler.cpp:354
-#, fuzzy
-msgid "/mail > Send offline message to player"
-msgstr "/msg > Zend een privébericht naar een gebruiker"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Voor meer informatie, typ /help <commando>."
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Commando: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Dit commando geeft een lijst weer van alle mogelijke commando's"
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Commando: /help <commando>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Dit commando geeft help weer van <commando>"
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Commando: /announce <msg>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** enkel mogelijk door een GM ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Dit commando stuurt het bericht <msg> naar alle spelers momenteel online."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Commando: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Dit commando maakt de chatlog van vorige chatsessies leeg"
-
-#: src/commandhandler.cpp:386
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Commando: /item <beleid>"
-
-#: src/commandhandler.cpp:387
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Commando: /join <kanaal>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Dit commando voegt je toe op kanaal <kanaal>."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Als <kanaal> niet bestaat, wordt het aangemaakt."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Commando: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Dit commando geeft een lijst weer van alle kanalen."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Commando /me <bericht>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Dit commando vertelt anderen dat je <msg> bent/doet."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Commando: /msg <nick> <bericht>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Commando: /msg <nick> <bericht>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Commando: /w <nick> <bericht>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Dit commando zendt de tekst <bericht> aan <nick>."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
-"(\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Commando: /query <nick>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Commando: /q <nick>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Dit commando probeert een tabblad aan te maken voor alle whispers tussen jou "
-"en <nick>"
-
-#: src/commandhandler.cpp:424
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Commando: /w <nick> <bericht>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:427
-#, fuzzy
-msgid "Command: /away"
-msgstr "Commando: /who"
-
-#: src/commandhandler.cpp:428
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Dit commando zet het onderwerp naar <bericht>."
-
-#: src/commandhandler.cpp:432
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Commando: /create <groepsnaam>"
-
-#: src/commandhandler.cpp:433
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Dit commando creëert een nieuwe groep genaamd <groepsnaam>"
-
-#: src/commandhandler.cpp:437
-#, fuzzy
-msgid "Command: /createguild <name>"
-msgstr "Commando: /create <groepsnaam>"
-
-#: src/commandhandler.cpp:438
-#, fuzzy
-msgid "This command creates a new guild called <name>."
-msgstr "Dit commando creëert een nieuwe groep genaamd <groepsnaam>"
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Commando: /party <nick>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Commando: /present"
-
-#: src/commandhandler.cpp:450
-#, fuzzy
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"Dit commando haalt een lijst op van spelers die je kunnen horen en zendt dit "
-"naar ofwel het logboek als dit opgeslagen wordt, of anders naar de chatlog."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Commando: /toggle <status>"
-
-#: src/commandhandler.cpp:456
-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:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<status> kan \"1\", \"yes\", \"true\" zijn om het in te schakelen, of \"0\", "
-"\"no\", \"false\" om het uit te schakelen."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Commando: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr ""
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Commando: /item <beleid>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Commando: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Dit commando geeft de naam weer van de huidige map."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Commando: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Type /help voor een lijst van commando's."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 #, fuzzy
 msgid "friend"
 msgstr "Vriend"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 #, fuzzy
 msgid "neutral"
 msgstr "Neutraal"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Groep succesvol aangemaakt."
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Groep succesvol aangemaakt."
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -756,12 +366,12 @@ msgstr ""
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -769,50 +379,52 @@ msgstr "Prijs: %s / Totaal: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Maximum"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Verkopen"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -968,7 +580,7 @@ msgstr "Registreren"
 msgid "Change Email"
 msgstr "Emailadres wijzigen"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -988,90 +600,90 @@ msgstr "Level: %d"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 #, fuzzy
 msgid "default"
 msgstr "Standaard"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr ""
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 #, fuzzy
 msgid "red"
 msgstr "Vriend"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 #, fuzzy
 msgid "green"
 msgstr "Groen: "
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 #, fuzzy
 msgid "blue"
 msgstr "Blauw: "
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr ""
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 #, fuzzy
 msgid "yellow"
 msgstr "laag"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 #, fuzzy
 msgid "pink"
 msgstr "Hyperlink"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr ""
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr ""
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 #, fuzzy
 msgid "brown"
 msgstr "Geworpen"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 #, fuzzy
 msgid "rainbow 1"
 msgstr "Regenboog"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 #, fuzzy
 msgid "rainbow 2"
 msgstr "Regenboog"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 #, fuzzy
 msgid "rainbow 3"
 msgstr "Regenboog"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d spelers zijn aanwezig."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -1206,7 +818,7 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1223,11 +835,11 @@ msgstr "Uitrusting"
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Sluiten"
@@ -1314,39 +926,39 @@ msgstr "Afhalen"
 msgid "Drop"
 msgstr "Neerleggen"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 #, fuzzy
 msgid "Unknown."
 msgstr "Onbekende foutmelding"
@@ -1493,7 +1105,7 @@ msgstr "Sluiten"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Inloggen"
 
@@ -1515,11 +1127,11 @@ msgstr "Onthoud Naam"
 msgid "Update:"
 msgstr ""
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
@@ -2004,56 +1616,56 @@ msgstr "Kies jouw server"
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/gui/serverdialog.cpp:229
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:246
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:232
-msgid "Use same ip for game sub servers"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Connect"
 msgstr "Verbinden..."
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 #, fuzzy
 msgid "Custom Server"
 msgstr "Aangepaste cursor"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Typ aub zowel het adres van de server, als de poort."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Wachten op server"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3573,34 +3185,34 @@ msgstr "Je hebt niet genoeg geld."
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Actualiseren..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 je later opnieuw probeert"
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -3846,6 +3458,13 @@ msgstr "Commando: /op <nick>"
 msgid "This command makes <nick> a channel operator."
 msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+"Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
+"(\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3912,6 +3531,11 @@ msgstr "Commando: /item"
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
 
+#: src/gui/widgets/whispertab.cpp:128
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Commando: /item <beleid>"
+
 #: src/gui/widgets/whispertab.cpp:129
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
@@ -4465,7 +4089,7 @@ msgstr[1] "Je raapte %s [@@%d|%s@@] op."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 #, fuzzy
 msgid "You see "
 msgstr "Jij krijgt %s."
@@ -5100,20 +4724,20 @@ msgstr "Fluisterbericht kon niet verzonden worden, gebruiker is offline."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 #, fuzzy
 msgid "MVP player."
 msgstr "Speler"
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 #, fuzzy
 msgid "MVP player: "
 msgstr "Speler"
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Kanalen worden niet ondersteund!"
 
@@ -5407,6 +5031,10 @@ msgstr "/item > Geeft weer/wijzigt de opties voor voorwerpdeling"
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Geeft weer/wijzigt de ervaringsdelingsopties"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
@@ -5897,6 +5525,237 @@ msgstr "Magie %+d"
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
+#~ msgid "-- Help --"
+#~ msgstr "-- Help --"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Deze help weergeven"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Mapnaam weergeven"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Aantal online gebruikers weergeven"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Vertel iets over jezelf"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Maak dit venster leeg"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Zend een privébericht naar een gebruiker"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > zelfde functie als msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > zelfde als msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr ""
+#~ "/query > Maakt een tabblad voor privéberichten met andere gebruikers"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > zelfde functie als query"
+
+#, fuzzy
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/close > Sluit de fluistertab"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Alle publieke kanalen weergeven"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Een kanaal creëren of bij aansluiten"
+
+#, fuzzy
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/create > Creëer een nieuwe groep"
+
+#, fuzzy
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/create > Creëer een nieuwe groep"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Een gebruiker uitnodigen in de groep"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr "/toggle > Bepalen of <return> de chatlog wisselt"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Lijst weergeven met alle aanwezige spelers (opgeslagen in "
+#~ "chatlog, als logging aanstaat)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Globale aankondiging (enkel GM)"
+
+#, fuzzy
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/close > Sluit de fluistertab"
+
+#, fuzzy
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/msg > Zend een privébericht naar een gebruiker"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Voor meer informatie, typ /help <commando>."
+
+#~ msgid "Command: /help"
+#~ msgstr "Commando: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Dit commando geeft een lijst weer van alle mogelijke commando's"
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Commando: /help <commando>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Dit commando geeft help weer van <commando>"
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Commando: /announce <msg>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** enkel mogelijk door een GM ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr ""
+#~ "Dit commando stuurt het bericht <msg> naar alle spelers momenteel online."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Commando: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Dit commando maakt de chatlog van vorige chatsessies leeg"
+
+#, fuzzy
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Commando: /item <beleid>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Commando: /join <kanaal>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Dit commando voegt je toe op kanaal <kanaal>."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Als <kanaal> niet bestaat, wordt het aangemaakt."
+
+#~ msgid "Command: /list"
+#~ msgstr "Commando: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Dit commando geeft een lijst weer van alle kanalen."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Commando /me <bericht>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Dit commando vertelt anderen dat je <msg> bent/doet."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Commando: /msg <nick> <bericht>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Commando: /msg <nick> <bericht>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Commando: /w <nick> <bericht>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Dit commando zendt de tekst <bericht> aan <nick>."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Commando: /query <nick>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Commando: /q <nick>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Dit commando probeert een tabblad aan te maken voor alle whispers tussen "
+#~ "jou en <nick>"
+
+#, fuzzy
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Commando: /w <nick> <bericht>"
+
+#, fuzzy
+#~ msgid "Command: /away"
+#~ msgstr "Commando: /who"
+
+#, fuzzy
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Dit commando zet het onderwerp naar <bericht>."
+
+#, fuzzy
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Commando: /create <groepsnaam>"
+
+#, fuzzy
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Dit commando creëert een nieuwe groep genaamd <groepsnaam>"
+
+#, fuzzy
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Commando: /create <groepsnaam>"
+
+#, fuzzy
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Dit commando creëert een nieuwe groep genaamd <groepsnaam>"
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Commando: /party <nick>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Commando: /present"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "Dit commando haalt een lijst op van spelers die je kunnen horen en zendt "
+#~ "dit naar ofwel het logboek als dit opgeslagen wordt, of anders naar de "
+#~ "chatlog."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Commando: /toggle <status>"
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<status> kan \"1\", \"yes\", \"true\" zijn om het in te schakelen, of "
+#~ "\"0\", \"no\", \"false\" om het uit te schakelen."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Commando: /toggle"
+
+#~ msgid "Command: /where"
+#~ msgstr "Commando: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Dit commando geeft de naam weer van de huidige map."
+
+#~ msgid "Command: /who"
+#~ msgstr "Commando: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Type /help voor een lijst van commando's."
+
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Deeltjes details"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 1f79b94c8..36add05cc 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: manaplus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2011-03-29 18:51+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) <>\n"
+"Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/being.cpp:489
@@ -53,10 +53,10 @@ msgstr "Verbinden met de spelserver"
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -91,536 +91,159 @@ msgstr "Registratie ongedaan gemaakt!"
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "-- Help --"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Deze help weergeven"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Mapnaam weergeven"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Aantal online gebruikers weergeven"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Vertel iets over jezelf"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Maak dit venster leeg"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Zend een privébericht naar een gebruiker"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > zelfde functie als msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > zelfde als msg"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Maakt een tabblad voor privéberichten met andere gebruikers"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > zelfde functie als query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-"/away > Vertel de andere fluisterende spelers dat je weg bent van je "
-"toetsenbord."
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Negeer een speler"
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Stop met een speler te negeren."
-
-#: src/commandhandler.cpp:322
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/ignoreall > Negeer alle geopende fluister tabs"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr "/erase > Een speler wegvegen"
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr "/befriend > Een speler te vriend maken"
-
-#: src/commandhandler.cpp:325
-msgid "/disregard > Disregard a player"
-msgstr ""
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr "/neutral > Beschouw een speler terug als neutraal"
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Alle publieke kanalen weergeven"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Een kanaal creëren of bij aansluiten"
-
-#: src/commandhandler.cpp:331
-msgid "/createparty > Create a new party"
-msgstr "/createparty > Maak een nieuwe groep"
-
-#: src/commandhandler.cpp:332
-msgid "/createguild > Create a new guild"
-msgstr "/createguild > Maak een nieuwe gilde"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Een gebruiker uitnodigen in de groep"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Bepalen of <return> de chatlog wisselt"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Lijst weergeven met alle aanwezige spelers (opgeslagen in "
-"chatlog, als logging aanstaat)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globale aankondiging (enkel GM)"
-
-#: src/commandhandler.cpp:342
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/closeall > Sluit alle geopende fluister tabs"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr "/all > Toon alle zichtbare personen in een debug tab"
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr "/move > Verplaats naar een gegeven positie"
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr "/navigate > Toon een weg naar gegeven positie"
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr "/target > Mik op een persoon"
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr "/outfit > Draag geindexeerde kleren"
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr "/emote > Toon geindexeerde emote"
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr "/follow > Volg een speler"
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr "/imitation > Imiteer een speler"
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr "/heal > Genees een speler"
-
-#: src/commandhandler.cpp:354
-msgid "/mail > Send offline message to player"
-msgstr "/mail > Zend een offline bericht naar een speler"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Voor meer informatie, typ /help <commando>."
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Commando: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Dit commando geeft een lijst weer van alle mogelijke commando's"
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Commando: /help <commando>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Dit commando geeft help weer van <commando>"
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Commando: /announce <msg>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** enkel mogelijk door een GM ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Dit commando stuurt het bericht <msg> naar alle spelers momenteel online."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Commando: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Dit commando maakt de chatlog van vorige chatsessies leeg"
-
-#: src/commandhandler.cpp:386
-msgid "Command: /ignore <player>"
-msgstr "Command: /ignore <player>"
-
-#: src/commandhandler.cpp:387
-msgid "This command ignores the given player regardless of current relations."
-msgstr ""
-"Dit commando negeert de gegeven speler niettegenstaande zijn relatie tot "
-"jou."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Commando: /join <kanaal>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Dit commando voegt je toe op kanaal <kanaal>."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Als <kanaal> niet bestaat, wordt het aangemaakt."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Commando: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Dit commando geeft een lijst weer van alle kanalen."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Commando /me <bericht>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Dit commando vertelt anderen dat je <msg> bent/doet."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Commando: /msg <nick> <bericht>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Commando: /msg <nick> <bericht>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Commando: /w <nick> <bericht>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Dit commando zendt de tekst <bericht> aan <nick>."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
-"(\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Commando: /query <nick>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Commando: /q <nick>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Dit commando probeert een tabblad aan te maken voor alle whispers tussen jou"
-" en <nick>"
-
-#: src/commandhandler.cpp:424
-msgid "Command: /away <afk reason>"
-msgstr "Commando: /away <afk reden>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-"Dit commando zegt dat je niet bij je computer zit met de gegeven reden."
-
-#: src/commandhandler.cpp:427
-msgid "Command: /away"
-msgstr "Commando: /away"
-
-#: src/commandhandler.cpp:428
-msgid "This command clears the away status and message."
-msgstr "Dit commando wist de away status en boodschap."
-
-#: src/commandhandler.cpp:432
-msgid "Command: /createparty <name>"
-msgstr "Commando: /createparty <naam>"
-
-#: src/commandhandler.cpp:433
-msgid "This command creates a new party called <name>."
-msgstr ""
-
-#: src/commandhandler.cpp:437
-msgid "Command: /createguild <name>"
-msgstr ""
-
-#: src/commandhandler.cpp:438
-msgid "This command creates a new guild called <name>."
-msgstr ""
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Commando: /party <nick>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Commando: /present"
-
-#: src/commandhandler.cpp:450
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Commando: /toggle <status>"
-
-#: src/commandhandler.cpp:456
-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:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<status> kan \"1\", \"yes\", \"true\" zijn om het in te schakelen, of \"0\","
-" \"no\", \"false\" om het uit te schakelen."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Commando: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr ""
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-msgid "Command: /unignore <player>"
-msgstr ""
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Commando: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Dit commando geeft de naam weer van de huidige map."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Commando: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Type /help voor een lijst van commando's."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -630,7 +253,8 @@ msgstr[1] ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -717,12 +341,12 @@ msgstr "Resultaat"
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -730,50 +354,52 @@ msgstr "Prijs: %s / Totaal: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr "-"
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Maximum"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Verkopen"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -923,7 +549,7 @@ msgstr "Registreren"
 msgid "Change Email"
 msgstr "Wijzig Email"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -942,80 +568,80 @@ msgstr "Niveau %d"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 msgid "default"
 msgstr "standaard"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr "zwart"
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 msgid "red"
 msgstr "rood"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 msgid "green"
 msgstr "groen"
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 msgid "blue"
 msgstr "blauw"
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr "goud"
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 msgid "yellow"
 msgstr "geel"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 msgid "pink"
 msgstr "roze"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr "paars"
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr "grijs"
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 msgid "brown"
 msgstr "bruin"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 msgid "rainbow 1"
 msgstr "regenboog 1"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 msgid "rainbow 2"
 msgstr "regenboog 2"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 msgid "rainbow 3"
 msgstr "regenboog 3"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -1139,7 +765,7 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1156,11 +782,11 @@ msgstr "Uitrusting"
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Sluiten"
@@ -1243,39 +869,39 @@ msgstr "Afhalen"
 msgid "Drop"
 msgstr "Neerleggen"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Onbekend."
 
@@ -1414,7 +1040,7 @@ msgstr ""
 msgid "Skip"
 msgstr "Overslaan"
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Inloggen"
 
@@ -1435,11 +1061,11 @@ msgstr "Onthoud gebruikersnaam"
 msgid "Update:"
 msgstr "Update:"
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 msgid "Change Server"
 msgstr "Wijzig Server"
 
@@ -1887,52 +1513,52 @@ msgstr ""
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/gui/serverdialog.cpp:229
-msgid "Server type:"
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:232
-msgid "Use same ip for game sub servers"
+#: src/gui/serverdialog.cpp:246
+msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Typ aub zowel het adres van de server, als de poort."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2566,8 +2192,8 @@ msgstr ""
 #: src/gui/setup_video.cpp:717
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
-"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte"
-" resolutie"
+"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
+"resolutie"
 
 #: src/gui/setup_video.cpp:751
 msgid "Particle Effect Settings Changed."
@@ -3363,11 +2989,10 @@ msgid "Change"
 msgstr "Veranderen"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in"
-" het venster."
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
+"het venster."
 
 #: src/gui/trade.cpp:359
 msgid "You don't have enough money."
@@ -3378,33 +3003,33 @@ msgstr "Je hebt niet genoeg geld."
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Actualiseren..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -3634,6 +3259,13 @@ msgstr "Commando: /op <nick>"
 msgid "This command makes <nick> a channel operator."
 msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+"Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
+"(\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3698,9 +3330,12 @@ msgstr ""
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
+#: src/gui/widgets/whispertab.cpp:128
+msgid "Command: /unignore <player>"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:62
@@ -4217,7 +3852,7 @@ msgstr[1] ""
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 msgid "You see "
 msgstr ""
 
@@ -4801,18 +4436,18 @@ msgstr ""
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Kanalen worden niet ondersteund!"
 
@@ -5078,6 +4713,10 @@ msgstr "/item > Geeft weer/wijzigt de opties voor voorwerpdeling"
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Geeft weer/wijzigt de ervaringsdelingsopties"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
@@ -5096,8 +4735,8 @@ msgid ""
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 "<beleid> kan een van de volgende zijn om voorwerpdeling in te schakelen: "
-"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", "
-"\"no\", \"false\"."
+"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", \"no"
+"\", \"false\"."
 
 #: src/net/tmwa/gui/partytab.cpp:99
 msgid "Command: /item"
@@ -5350,15 +4989,13 @@ msgstr "Bericht"
 
 #: src/net/tmwa/playerhandler.cpp:332
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
 
 #: src/net/tmwa/playerhandler.cpp:342
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:447
@@ -5549,3 +5186,255 @@ msgstr "Magie %+d"
 #: src/resources/itemdb.cpp:155
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
+
+#~ msgid "-- Help --"
+#~ msgstr "-- Help --"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Deze help weergeven"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Mapnaam weergeven"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Aantal online gebruikers weergeven"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Vertel iets over jezelf"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Maak dit venster leeg"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Zend een privébericht naar een gebruiker"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > zelfde functie als msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > zelfde als msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr ""
+#~ "/query > Maakt een tabblad voor privéberichten met andere gebruikers"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > zelfde functie als query"
+
+#~ msgid "/away > Tell the other whispering players you're away from keyboard."
+#~ msgstr ""
+#~ "/away > Vertel de andere fluisterende spelers dat je weg bent van je "
+#~ "toetsenbord."
+
+#~ msgid "/ignore > ignore a player"
+#~ msgstr "/ignore > Negeer een speler"
+
+#~ msgid "/unignore > stop ignoring a player"
+#~ msgstr "/unignore > Stop met een speler te negeren."
+
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/ignoreall > Negeer alle geopende fluister tabs"
+
+#~ msgid "/erase > Erase a player"
+#~ msgstr "/erase > Een speler wegvegen"
+
+#~ msgid "/befriend > Be friend a player"
+#~ msgstr "/befriend > Een speler te vriend maken"
+
+#~ msgid "/neutral > Neutral a player"
+#~ msgstr "/neutral > Beschouw een speler terug als neutraal"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Alle publieke kanalen weergeven"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Een kanaal creëren of bij aansluiten"
+
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/createparty > Maak een nieuwe groep"
+
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/createguild > Maak een nieuwe gilde"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Een gebruiker uitnodigen in de groep"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr "/toggle > Bepalen of <return> de chatlog wisselt"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Lijst weergeven met alle aanwezige spelers (opgeslagen in "
+#~ "chatlog, als logging aanstaat)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Globale aankondiging (enkel GM)"
+
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/closeall > Sluit alle geopende fluister tabs"
+
+#~ msgid "/all > Show all visible beings in debug tab"
+#~ msgstr "/all > Toon alle zichtbare personen in een debug tab"
+
+#~ msgid "/move > Move to given position"
+#~ msgstr "/move > Verplaats naar een gegeven positie"
+
+#~ msgid "/navigate > Draw path to given position"
+#~ msgstr "/navigate > Toon een weg naar gegeven positie"
+
+#~ msgid "/target > Set target to being"
+#~ msgstr "/target > Mik op een persoon"
+
+#~ msgid "/outfit > Wear outfit by index"
+#~ msgstr "/outfit > Draag geindexeerde kleren"
+
+#~ msgid "/emote > Show emote by index"
+#~ msgstr "/emote > Toon geindexeerde emote"
+
+#~ msgid "/follow > Follow player"
+#~ msgstr "/follow > Volg een speler"
+
+#~ msgid "/imitation > Imitate player"
+#~ msgstr "/imitation > Imiteer een speler"
+
+#~ msgid "/heal > Heal player"
+#~ msgstr "/heal > Genees een speler"
+
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/mail > Zend een offline bericht naar een speler"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Voor meer informatie, typ /help <commando>."
+
+#~ msgid "Command: /help"
+#~ msgstr "Commando: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Dit commando geeft een lijst weer van alle mogelijke commando's"
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Commando: /help <commando>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Dit commando geeft help weer van <commando>"
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Commando: /announce <msg>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** enkel mogelijk door een GM ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr ""
+#~ "Dit commando stuurt het bericht <msg> naar alle spelers momenteel online."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Commando: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Dit commando maakt de chatlog van vorige chatsessies leeg"
+
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Command: /ignore <player>"
+
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr ""
+#~ "Dit commando negeert de gegeven speler niettegenstaande zijn relatie tot "
+#~ "jou."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Commando: /join <kanaal>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Dit commando voegt je toe op kanaal <kanaal>."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Als <kanaal> niet bestaat, wordt het aangemaakt."
+
+#~ msgid "Command: /list"
+#~ msgstr "Commando: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Dit commando geeft een lijst weer van alle kanalen."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Commando /me <bericht>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Dit commando vertelt anderen dat je <msg> bent/doet."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Commando: /msg <nick> <bericht>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Commando: /msg <nick> <bericht>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Commando: /w <nick> <bericht>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Dit commando zendt de tekst <bericht> aan <nick>."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Commando: /query <nick>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Commando: /q <nick>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Dit commando probeert een tabblad aan te maken voor alle whispers tussen "
+#~ "jou en <nick>"
+
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Commando: /away <afk reden>"
+
+#~ msgid "This command tells you're away from keyboard with the given reason."
+#~ msgstr ""
+#~ "Dit commando zegt dat je niet bij je computer zit met de gegeven reden."
+
+#~ msgid "Command: /away"
+#~ msgstr "Commando: /away"
+
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Dit commando wist de away status en boodschap."
+
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Commando: /createparty <naam>"
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Commando: /party <nick>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Commando: /present"
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Commando: /toggle <status>"
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<status> kan \"1\", \"yes\", \"true\" zijn om het in te schakelen, of "
+#~ "\"0\", \"no\", \"false\" om het uit te schakelen."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Commando: /toggle"
+
+#~ msgid "Command: /where"
+#~ msgstr "Commando: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Dit commando geeft de naam weer van de huidige map."
+
+#~ msgid "Command: /who"
+#~ msgstr "Commando: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Dit commando geeft het aantal spelers dat momenteel online is weer."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Type /help voor een lijst van commando's."
diff --git a/po/pl.po b/po/pl.po
index 0dd11cffe..bac4b7d40 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2009-09-14 06:59+0000\n"
 "Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -63,10 +63,10 @@ msgstr "Łączenie z serwerem map..."
 msgid "Changing game servers"
 msgstr "Serwer"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -105,426 +105,34 @@ msgstr "Wyrejestruj"
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy host aktualizacji: "
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Nieznane polecenie."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "-- Pomoc --"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Pokazuje tę pomoc"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Wyświetla nazwę mapy"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Wyświetla liczbę podłączonych użytkowników"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Powiedz coś o sobie"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Czyści to okno"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Wysyła prywatną wiadomość do użytkownika"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias  polecenia msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > Alias polecenia msg"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
-"/query > Tworzy zakładkę dla prywatnych wiadomości z innym użytkownikiem"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > Alias polecenia query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:322
-#, fuzzy
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/close > Zamyka zakładkę szeptania"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr ""
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr ""
-
-#: src/commandhandler.cpp:325
-#, fuzzy
-msgid "/disregard > Disregard a player"
-msgstr "@@disregard|Lekceważ %s@@"
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr ""
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Pokaż wszystkie publiczne kanały"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Dołącz lub utwórz kanał"
-
-#: src/commandhandler.cpp:331
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Utworzenie nowej grupy"
-
-#: src/commandhandler.cpp:332
-#, fuzzy
-msgid "/createguild > Create a new guild"
-msgstr "/create > Utworzenie nowej grupy"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Zaproś użytkownika do grupy"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Określa czy <return> przełącza dziennik czatu"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Pobiera listę obecnych graczy (przesyła do dzienika czatu, jeżeli "
-"zapisywanie jest włączone)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globalne ogłoszenie (tylko GM)"
-
-#: src/commandhandler.cpp:342
-#, fuzzy
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/close > Zamyka zakładkę szeptania"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr ""
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr ""
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr ""
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr ""
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr ""
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr ""
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr ""
-
-#: src/commandhandler.cpp:354
-#, fuzzy
-msgid "/mail > Send offline message to player"
-msgstr "/msg > Wysyła prywatną wiadomość do użytkownika"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Aby uzyskać więcej informacji, wpisz /help <komenda>"
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Komenda: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Ta komenda wyświetla listę dostępnych komend."
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Komenda: /help <komenda>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Ta komenda wyświetla pomoc dotyczącą <komenda>"
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Komenda: /announce <wiadomość>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** dostępne tylko dla GM ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Ta komenda wysyła wiadomość <wiadomość> to wszystkich połączonych graczy."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Komenda: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Ta komenda czyści zawartość okna."
-
-#: src/commandhandler.cpp:386
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Komenda: /item <zasada>"
-
-#: src/commandhandler.cpp:387
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Ta komenda wyświetla liczbę połączonych graczy."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Komenda: /join <kanał>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Ta komenda powoduje, iż wejdziesz do  <kanał>"
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Jeżeli <kanał> nie istnieje, to zostanie utworzony."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Komenda: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Ta komenda pokazuje listę wszystkich kanałów."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Komenda: /me <wiadomość>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Ta komenda mówi innym co (robisz) <wiadomość>."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Komenda: /msg <ksywka> <wiadomość>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Komenda: /whisper <ksywka> <wiadomość>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Komenda: /w <ksywka> <wiadomość>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Ta komenda wysyła tekst <wiadomość> do <ksywka>"
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Jeżeli <postać> ma spację, należy ją zapisać w cudzysłowie (\")"
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Komenda: /query <ksywka>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Komenda: /q <ksywka>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Ta komeda próbuje utworzyć zakładkę dla prywatnych wiadomości pomiędzy tobą "
-"i <ksywka>."
-
-#: src/commandhandler.cpp:424
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Komenda: /w <ksywka> <wiadomość>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:427
-#, fuzzy
-msgid "Command: /away"
-msgstr "Komenda: /who"
-
-#: src/commandhandler.cpp:428
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Ta komenda ustawia temat na <wiadomość>."
-
-#: src/commandhandler.cpp:432
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Komenda: /create <nazwa-grupy>"
-
-#: src/commandhandler.cpp:433
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Te komendy utworzą nową grupę nazwaną <nazwa-grupy>."
-
-#: src/commandhandler.cpp:437
-#, fuzzy
-msgid "Command: /createguild <name>"
-msgstr "Komenda: /create <nazwa-grupy>"
-
-#: src/commandhandler.cpp:438
-#, fuzzy
-msgid "This command creates a new guild called <name>."
-msgstr "Te komendy utworzą nową grupę nazwaną <nazwa-grupy>."
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Komenda: /party <ksywka>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Komenda: /present"
-
-#: src/commandhandler.cpp:450
-#, fuzzy
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"Ta komenda pobiera listę graczy w zasięgu słuchu i wysyła ją do dziennika "
-"zapisu, lub dziennika czatu."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Komenda: /toggle <stan>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Ta komenda ustawia, czy klawisz return powinien włączać dziennik zapisu, lub "
-"czy dziennik zapisu powinien się automatycznie wyłączyć."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<stan> może być jednym z \"1\", \"yes\", \"true\" aby uaktywnić przełącznik, "
-"lub \"0\", \"no\", \"false\" by deaktywować przełącznik."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Komenda: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "Ta komenda wyświetla status przełącznika"
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Komenda: /item <zasada>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Komenda: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Komenda: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Ta komenda wyświetla liczbę połączonych graczy."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Wpisz /help aby usyskać listę komend."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Nie można wysłać pustych szeptów!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -533,105 +141,105 @@ msgstr ""
 "Nie można utworzyć zakładki szeptu dla ksywki \"%s\"! Już istnieje, albo to "
 "ty."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Prośba o dołączenie do kanału %s."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Brakuje nazwy grupy."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 #, fuzzy
 msgid "friend"
 msgstr "Przyjaciel"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 #, fuzzy
 msgid "disregarded"
 msgstr "Nielubiany"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 #, fuzzy
 msgid "neutral"
 msgstr "Neutralny"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Pomyślnie utworzono grupę."
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Pomyślnie utworzono grupę."
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -639,7 +247,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -647,7 +255,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -655,7 +263,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -663,7 +271,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -766,12 +374,12 @@ msgstr ""
 msgid "Reset"
 msgstr "Resetuj"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Kup"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -779,50 +387,52 @@ msgstr "Cena: %s/ Razem: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Maks."
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Sklep"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Sprzedaj"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -978,7 +588,7 @@ msgstr "Wyrejestruj"
 msgid "Change Email"
 msgstr "Zmień adres Email"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -998,90 +608,90 @@ msgstr "Poziom: %d"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 #, fuzzy
 msgid "default"
 msgstr "Domyślny"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr ""
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 #, fuzzy
 msgid "red"
 msgstr "Przyjaciel"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 #, fuzzy
 msgid "green"
 msgstr "Zielony: "
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 #, fuzzy
 msgid "blue"
 msgstr "Niebieski: "
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr ""
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 #, fuzzy
 msgid "yellow"
 msgstr "niskie"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 #, fuzzy
 msgid "pink"
 msgstr "Hiperłącze"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr ""
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr ""
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 #, fuzzy
 msgid "brown"
 msgstr "Rzucana"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 #, fuzzy
 msgid "rainbow 1"
 msgstr "Tęcza"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 #, fuzzy
 msgid "rainbow 2"
 msgstr "Tęcza"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 #, fuzzy
 msgid "rainbow 3"
 msgstr "Tęcza"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d graczy jest obecnych."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -1216,7 +826,7 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1233,11 +843,11 @@ msgstr "Ekwipunek"
 msgid "Unequip"
 msgstr "Zdejmij"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Zamknij"
@@ -1323,39 +933,39 @@ msgstr "Pobierz"
 msgid "Drop"
 msgstr "Upuść"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "wszystkie"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Podaj ilość rzeczy do przechowania."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Wybierz ilość przedmiotów do pobrania."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 #, fuzzy
 msgid "Unknown."
 msgstr "Nieznany błąd"
@@ -1502,7 +1112,7 @@ msgstr "Zamknij"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Użytkownik"
 
@@ -1524,11 +1134,11 @@ msgstr "Zapamiętaj użytkownika"
 msgid "Update:"
 msgstr ""
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 #, fuzzy
 msgid "Change Server"
 msgstr "Serwer"
@@ -2023,56 +1633,56 @@ msgstr "Wybierz twój serwer"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:229
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:246
 #, fuzzy
 msgid "Server type:"
 msgstr "Serwer:"
 
-#: src/gui/serverdialog.cpp:232
-msgid "Use same ip for game sub servers"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Connect"
 msgstr "Łączenie..."
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 #, fuzzy
 msgid "Custom Server"
 msgstr "Własny kursor"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Proszę wpisać adres i port serwera"
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Oczekiwanie na serwer"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3592,34 +3202,34 @@ msgstr "Nie masz wystarczającej ilości pieniędzy."
 msgid "Name: %s"
 msgstr "Imię: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Aktualizacja..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Graj"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 spróbował później"
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -3865,6 +3475,11 @@ msgstr "Komenda: /op <ksywka>"
 msgid "This command makes <nick> a channel operator."
 msgstr "Ta komenda uczyni <ksywka> operatorem kanału."
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Jeżeli <postać> ma spację, należy ją zapisać w cudzysłowie (\")"
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "Operatorzy kanału mogą wykopywać i dawać opy użytkownikom kanału."
@@ -3929,6 +3544,11 @@ msgstr "Komenda: /przedmiot"
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
+#: src/gui/widgets/whispertab.cpp:128
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Komenda: /item <zasada>"
+
 #: src/gui/widgets/whispertab.cpp:129
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
@@ -4482,7 +4102,7 @@ msgstr[1] "Podniosłeś %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 #, fuzzy
 msgid "You see "
 msgstr "Otrzymujesz %s"
@@ -5115,20 +4735,20 @@ msgstr "Szept nie mógł zostać wysłany, użytkownik jest offline."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 #, fuzzy
 msgid "MVP player."
 msgstr "Gracz"
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 #, fuzzy
 msgid "MVP player: "
 msgstr "Gracz"
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Kanały nie są wspierane!"
 
@@ -5422,6 +5042,10 @@ msgstr "/item > Pokaż/zmień opcje podziału przedmiotu w grupie"
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Pokaż/zmień opcje pozdziału doświadczenia w grupie"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Komenda powoduje opuszczenie grupy przez gracza"
@@ -5905,6 +5529,250 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
+#~ msgid "-- Help --"
+#~ msgstr "-- Pomoc --"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Pokazuje tę pomoc"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Wyświetla nazwę mapy"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Wyświetla liczbę podłączonych użytkowników"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Powiedz coś o sobie"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Czyści to okno"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Wysyła prywatną wiadomość do użytkownika"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > Alias  polecenia msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > Alias polecenia msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr ""
+#~ "/query > Tworzy zakładkę dla prywatnych wiadomości z innym użytkownikiem"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > Alias polecenia query"
+
+#, fuzzy
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/close > Zamyka zakładkę szeptania"
+
+#, fuzzy
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "@@disregard|Lekceważ %s@@"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Pokaż wszystkie publiczne kanały"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Dołącz lub utwórz kanał"
+
+#, fuzzy
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/create > Utworzenie nowej grupy"
+
+#, fuzzy
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/create > Utworzenie nowej grupy"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Zaproś użytkownika do grupy"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr "/toggle > Określa czy <return> przełącza dziennik czatu"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Pobiera listę obecnych graczy (przesyła do dzienika czatu, "
+#~ "jeżeli zapisywanie jest włączone)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Globalne ogłoszenie (tylko GM)"
+
+#, fuzzy
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/close > Zamyka zakładkę szeptania"
+
+#, fuzzy
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/msg > Wysyła prywatną wiadomość do użytkownika"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Aby uzyskać więcej informacji, wpisz /help <komenda>"
+
+#~ msgid "Command: /help"
+#~ msgstr "Komenda: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Ta komenda wyświetla listę dostępnych komend."
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Komenda: /help <komenda>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Ta komenda wyświetla pomoc dotyczącą <komenda>"
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Komenda: /announce <wiadomość>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** dostępne tylko dla GM ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr ""
+#~ "Ta komenda wysyła wiadomość <wiadomość> to wszystkich połączonych graczy."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Komenda: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Ta komenda czyści zawartość okna."
+
+#, fuzzy
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Komenda: /item <zasada>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr "Ta komenda wyświetla liczbę połączonych graczy."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Komenda: /join <kanał>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Ta komenda powoduje, iż wejdziesz do  <kanał>"
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Jeżeli <kanał> nie istnieje, to zostanie utworzony."
+
+#~ msgid "Command: /list"
+#~ msgstr "Komenda: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Ta komenda pokazuje listę wszystkich kanałów."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Komenda: /me <wiadomość>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Ta komenda mówi innym co (robisz) <wiadomość>."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Komenda: /msg <ksywka> <wiadomość>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Komenda: /whisper <ksywka> <wiadomość>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Komenda: /w <ksywka> <wiadomość>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Ta komenda wysyła tekst <wiadomość> do <ksywka>"
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Komenda: /query <ksywka>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Komenda: /q <ksywka>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Ta komeda próbuje utworzyć zakładkę dla prywatnych wiadomości pomiędzy "
+#~ "tobą i <ksywka>."
+
+#, fuzzy
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Komenda: /w <ksywka> <wiadomość>"
+
+#, fuzzy
+#~ msgid "Command: /away"
+#~ msgstr "Komenda: /who"
+
+#, fuzzy
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Ta komenda ustawia temat na <wiadomość>."
+
+#, fuzzy
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Komenda: /create <nazwa-grupy>"
+
+#, fuzzy
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Te komendy utworzą nową grupę nazwaną <nazwa-grupy>."
+
+#, fuzzy
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Komenda: /create <nazwa-grupy>"
+
+#, fuzzy
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Te komendy utworzą nową grupę nazwaną <nazwa-grupy>."
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Komenda: /party <ksywka>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Komenda: /present"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "Ta komenda pobiera listę graczy w zasięgu słuchu i wysyła ją do dziennika "
+#~ "zapisu, lub dziennika czatu."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Komenda: /toggle <stan>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr ""
+#~ "Ta komenda ustawia, czy klawisz return powinien włączać dziennik zapisu, "
+#~ "lub czy dziennik zapisu powinien się automatycznie wyłączyć."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<stan> może być jednym z \"1\", \"yes\", \"true\" aby uaktywnić "
+#~ "przełącznik, lub \"0\", \"no\", \"false\" by deaktywować przełącznik."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Komenda: /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "Ta komenda wyświetla status przełącznika"
+
+#~ msgid "Command: /where"
+#~ msgstr "Komenda: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
+
+#~ msgid "Command: /who"
+#~ msgstr "Komenda: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Ta komenda wyświetla liczbę połączonych graczy."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Wpisz /help aby usyskać listę komend."
+
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Detale cząsteczek"
diff --git a/po/pt.po b/po/pt.po
index 17c19418b..c71ecc32e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: manaplus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2011-03-29 23:07+0000\n"
 "Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese <>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/being.cpp:489
@@ -53,10 +53,10 @@ msgstr "Conectando ao servidor do jogo"
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -91,539 +91,161 @@ msgstr "Registro cancelado com sucesso"
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "--Ajuda--"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Exibe esta ajuda"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Exibe o nome do mapa"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Exibe o número de usuários online"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Diz alguma coisa sobre você"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Limpa janela atual"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Envia uma messagem privada a um usuário"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > O mesmo que /msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > O mesmo que /msg"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Abre uma aba de chat com outro usuário"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > O mesmo que /query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-"/away > Diz que você está longe do teclado para quem te enviar uma mensagem "
-"privada ."
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Ignora um jogador"
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Deixa de ignorar um jogador"
-
-#: src/commandhandler.cpp:322
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/ignoreall > Ignorar todas abas abertas"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr "/erase > Apaga um jogador"
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr "/befriend > Ser amigo de um jogador"
-
-#: src/commandhandler.cpp:325
-msgid "/disregard > Disregard a player"
-msgstr "/disregard > Desconsiderar um jogador"
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr "/neutral > Deixar jogador neutro"
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Exibir todos os canais públicos"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Criar ou entrar em um canal"
-
-#: src/commandhandler.cpp:331
-msgid "/createparty > Create a new party"
-msgstr "/createparty > Cria um novo grupo"
-
-#: src/commandhandler.cpp:332
-msgid "/createguild > Create a new guild"
-msgstr "/createguild > Cria uma nova guilda"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Convidar um usuário para o grupo"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Determina se <enter> exibe a janela de chat"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Mostra a lista de jogadores presentes (envia para o log de chat, "
-"se estiver gravando)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Anúncio Global (Somente GM)"
-
-#: src/commandhandler.cpp:342
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/closeall > Fecha todas as abas abertas"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr "/all > Mostrar todos os seres visíveis na aba do Depurador"
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr "/move > Mover para a posição marcada"
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr "/navigate > Marcar um caminho para uma posição determinada"
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr "/target > Definir um alvo"
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr "/outfit > Usar roupa por índice"
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr "/emote > Mostrar emoticons por índice"
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr "/follow > Seguir jogador"
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr "/imitation > Imitar jogador"
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr "/heal > Curar jogador"
-
-#: src/commandhandler.cpp:354
-msgid "/mail > Send offline message to player"
-msgstr "/mail > Enviar menssagem a um jogador offline"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Para mais informações, digite /help <comando>."
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Comando: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Exibe uma lista de todos os comandos disponíveis."
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Comando: /help <comando>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Exibe o conteúdo de ajuda do <comando>"
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Comando: /announce <msg>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** Disponivel apenas a GM's ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Este comando envia a mensagem <msg> para todos os jogadores online."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Comando: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Este comando limpa a janela de chat."
-
-#: src/commandhandler.cpp:386
-msgid "Command: /ignore <player>"
-msgstr "Comando: /ignore <nome do jogador>"
-
-#: src/commandhandler.cpp:387
-msgid "This command ignores the given player regardless of current relations."
-msgstr ""
-"Este comando ignora o jogador indicado, independente de sua relação com o "
-"mesmo."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Comando: /join <canal>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Este comando faz você entrar em <canal>."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Se o <canal> não existe, ele será criado."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Comando: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Este comando exibe uma lista com todos os canais."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Comando: /me <mensagem>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Este comando diz aos outros o que eu estou (a fazer) <msg>."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Comando: /msg <nick> <mensagem>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Comando: /whisper <nick> <mensagem>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Comando: /w <nick> <mensagem>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Este comando envia o texto <mensagem> para <nick>."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Comando: /query <nick>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Comando: /q <nick>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Este comando cria uma aba para mensagens privadas entre você e <nick>."
-
-#: src/commandhandler.cpp:424
-msgid "Command: /away <afk reason>"
-msgstr "Comando: /away <motivo>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-"Este comando mostra que você está longe do teclado, indicando a razão dada."
-
-#: src/commandhandler.cpp:427
-msgid "Command: /away"
-msgstr "Comando: /away"
-
-#: src/commandhandler.cpp:428
-msgid "This command clears the away status and message."
-msgstr "Este comando limpa o status e a mensagem \"away\"."
-
-#: src/commandhandler.cpp:432
-msgid "Command: /createparty <name>"
-msgstr "Comando: /createparty <nome>"
-
-#: src/commandhandler.cpp:433
-msgid "This command creates a new party called <name>."
-msgstr "Este comando cria um novo grupo chamado <nome>."
-
-#: src/commandhandler.cpp:437
-msgid "Command: /createguild <name>"
-msgstr "Comando: /createguild <nome>"
-
-#: src/commandhandler.cpp:438
-msgid "This command creates a new guild called <name>."
-msgstr "Este comando cria uma nova guilda chamada <nome>"
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Comando: /party <nick>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Este comando convida <nick> para o seu grupo."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Comando: /present"
-
-#: src/commandhandler.cpp:450
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"Este comando busca uma lista de jogadores por perto e envia para o chat."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Comando: /toggle <estado>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Este comando define se a tecla enter deve alternar para o log do chat ou se "
-"o log do chat fica oculto automaticamente."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<estado> pode ser \"1\", \"yes\" e \"true\" para ativar ou \"0\", \"no\" e "
-"\"false\" para desativar."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Comando: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "Este comando mostra o status da tecla enter."
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-msgid "Command: /unignore <player>"
-msgstr "Comando: /unignore <jogador>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-"Este comando para de ignorar o jogador indicado se ele estiver sendo "
-"ignorado"
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Comando: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Mostra o nome do mapa atual."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Comando: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Exibe o número total de jogadores online."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Digite /help para uma lista de todos os comandos."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
-" já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
+"já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -633,7 +255,8 @@ msgstr[1] "%d segundos"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -720,12 +343,12 @@ msgstr "Resultado"
 msgid "Reset"
 msgstr "Resetar"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -733,50 +356,52 @@ msgstr "Preço: %s / Total: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr "-"
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Máximo"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -926,7 +551,7 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Alterar email"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -945,80 +570,80 @@ msgstr "Nível %d"
 msgid "(empty)"
 msgstr "(vazio)"
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 msgid "default"
 msgstr "padrão"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr "preto"
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 msgid "red"
 msgstr "vermelho"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 msgid "green"
 msgstr "verde"
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 msgid "blue"
 msgstr "azul"
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr "ouro"
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 msgid "yellow"
 msgstr "amarelo"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 msgid "pink"
 msgstr "rosa"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr "roxo"
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr "cinza"
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 msgid "brown"
 msgstr "marrom"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 msgid "rainbow 1"
 msgstr "arco-íris 1"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 msgid "rainbow 2"
 msgstr "arco-íris 2"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 msgid "rainbow 3"
 msgstr "arco-íris 3"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -1142,7 +767,7 @@ msgstr "Entrada: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1159,11 +784,11 @@ msgstr "Equipamento"
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Fechar"
@@ -1246,39 +871,39 @@ msgstr "Retirar"
 msgid "Drop"
 msgstr "Descartar"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tudo"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra"
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda"
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Desconhecido"
 
@@ -1417,7 +1042,7 @@ msgstr "Fechar"
 msgid "Skip"
 msgstr "Passar"
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Login"
 
@@ -1438,11 +1063,11 @@ msgstr "Lembrar usuário"
 msgid "Update:"
 msgstr "Atualização:"
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 msgid "Change Server"
 msgstr "Trocar servidor"
 
@@ -1890,52 +1515,52 @@ msgstr "Escolha seu servidor"
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:229
-msgid "Server type:"
-msgstr "Tipo de servidor:"
-
-#: src/gui/serverdialog.cpp:232
+#: src/gui/serverdialog.cpp:231
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:246
+msgid "Server type:"
+msgstr "Tipo de servidor:"
+
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 msgid "Custom Server"
 msgstr "Servidor customizado"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -3367,8 +2992,7 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3381,33 +3005,33 @@ msgstr "Você não tem dinheiro suficiente."
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Concluído"
 
@@ -3635,6 +3259,11 @@ msgstr "Comando: /op <nick>"
 msgid "This command makes <nick> a channel operator."
 msgstr "Tornar <nick> operador do canal."
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3698,9 +3327,12 @@ msgstr "Comando: /ignore"
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Este comando ignora o outro jogador."
 
+#: src/gui/widgets/whispertab.cpp:128
+msgid "Command: /unignore <player>"
+msgstr "Comando: /unignore <jogador>"
+
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -4220,7 +3852,7 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 msgid "You see "
 msgstr "Você vê "
 
@@ -4806,18 +4438,18 @@ msgstr "Mensagem privada não pode ser enviada, %s está offline."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 msgid "MVP player."
 msgstr "Jogador VIP."
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 msgid "MVP player: "
 msgstr "Jogador VIP:  "
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Não há suporte para canais!"
 
@@ -5084,6 +4716,10 @@ msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Este comando convida <nick> para o seu grupo."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Este comando faz com que o jogador saia do grupo."
@@ -5119,8 +4755,7 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:106
 msgid "This command changes the party's experience sharing policy."
-msgstr ""
-"Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:108
 msgid ""
@@ -5137,8 +4772,7 @@ msgstr "Comando: /exp"
 #: src/net/tmwa/gui/partytab.cpp:112
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do "
-"grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:146 src/net/tmwa/partyhandler.cpp:287
 msgid "Item sharing enabled."
@@ -5360,15 +4994,13 @@ msgstr "Mensagem"
 
 #: src/net/tmwa/playerhandler.cpp:332
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
 #: src/net/tmwa/playerhandler.cpp:342
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
@@ -5561,3 +5193,287 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:155
 msgid "Unknown item"
 msgstr "Item desconhecido"
+
+#~ msgid "-- Help --"
+#~ msgstr "--Ajuda--"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Exibe esta ajuda"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Exibe o nome do mapa"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Exibe o número de usuários online"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Diz alguma coisa sobre você"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Limpa janela atual"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Envia uma messagem privada a um usuário"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > O mesmo que /msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > O mesmo que /msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr "/query > Abre uma aba de chat com outro usuário"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > O mesmo que /query"
+
+#~ msgid "/away > Tell the other whispering players you're away from keyboard."
+#~ msgstr ""
+#~ "/away > Diz que você está longe do teclado para quem te enviar uma "
+#~ "mensagem privada ."
+
+#~ msgid "/ignore > ignore a player"
+#~ msgstr "/ignore > Ignora um jogador"
+
+#~ msgid "/unignore > stop ignoring a player"
+#~ msgstr "/unignore > Deixa de ignorar um jogador"
+
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/ignoreall > Ignorar todas abas abertas"
+
+#~ msgid "/erase > Erase a player"
+#~ msgstr "/erase > Apaga um jogador"
+
+#~ msgid "/befriend > Be friend a player"
+#~ msgstr "/befriend > Ser amigo de um jogador"
+
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "/disregard > Desconsiderar um jogador"
+
+#~ msgid "/neutral > Neutral a player"
+#~ msgstr "/neutral > Deixar jogador neutro"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Exibir todos os canais públicos"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Criar ou entrar em um canal"
+
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/createparty > Cria um novo grupo"
+
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/createguild > Cria uma nova guilda"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Convidar um usuário para o grupo"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr "/toggle > Determina se <enter> exibe a janela de chat"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Mostra a lista de jogadores presentes (envia para o log de "
+#~ "chat, se estiver gravando)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Anúncio Global (Somente GM)"
+
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/closeall > Fecha todas as abas abertas"
+
+#~ msgid "/all > Show all visible beings in debug tab"
+#~ msgstr "/all > Mostrar todos os seres visíveis na aba do Depurador"
+
+#~ msgid "/move > Move to given position"
+#~ msgstr "/move > Mover para a posição marcada"
+
+#~ msgid "/navigate > Draw path to given position"
+#~ msgstr "/navigate > Marcar um caminho para uma posição determinada"
+
+#~ msgid "/target > Set target to being"
+#~ msgstr "/target > Definir um alvo"
+
+#~ msgid "/outfit > Wear outfit by index"
+#~ msgstr "/outfit > Usar roupa por índice"
+
+#~ msgid "/emote > Show emote by index"
+#~ msgstr "/emote > Mostrar emoticons por índice"
+
+#~ msgid "/follow > Follow player"
+#~ msgstr "/follow > Seguir jogador"
+
+#~ msgid "/imitation > Imitate player"
+#~ msgstr "/imitation > Imitar jogador"
+
+#~ msgid "/heal > Heal player"
+#~ msgstr "/heal > Curar jogador"
+
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/mail > Enviar menssagem a um jogador offline"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Para mais informações, digite /help <comando>."
+
+#~ msgid "Command: /help"
+#~ msgstr "Comando: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Exibe uma lista de todos os comandos disponíveis."
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Comando: /help <comando>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Exibe o conteúdo de ajuda do <comando>"
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Comando: /announce <msg>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** Disponivel apenas a GM's ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr "Este comando envia a mensagem <msg> para todos os jogadores online."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Comando: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Este comando limpa a janela de chat."
+
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Comando: /ignore <nome do jogador>"
+
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr ""
+#~ "Este comando ignora o jogador indicado, independente de sua relação com o "
+#~ "mesmo."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Comando: /join <canal>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Este comando faz você entrar em <canal>."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Se o <canal> não existe, ele será criado."
+
+#~ msgid "Command: /list"
+#~ msgstr "Comando: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Este comando exibe uma lista com todos os canais."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Comando: /me <mensagem>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Este comando diz aos outros o que eu estou (a fazer) <msg>."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Comando: /msg <nick> <mensagem>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Comando: /whisper <nick> <mensagem>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Comando: /w <nick> <mensagem>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Este comando envia o texto <mensagem> para <nick>."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Comando: /query <nick>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Comando: /q <nick>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Este comando cria uma aba para mensagens privadas entre você e <nick>."
+
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Comando: /away <motivo>"
+
+#~ msgid "This command tells you're away from keyboard with the given reason."
+#~ msgstr ""
+#~ "Este comando mostra que você está longe do teclado, indicando a razão "
+#~ "dada."
+
+#~ msgid "Command: /away"
+#~ msgstr "Comando: /away"
+
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Este comando limpa o status e a mensagem \"away\"."
+
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Comando: /createparty <nome>"
+
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Este comando cria um novo grupo chamado <nome>."
+
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Comando: /createguild <nome>"
+
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Este comando cria uma nova guilda chamada <nome>"
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Comando: /party <nick>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Comando: /present"
+
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "Este comando busca uma lista de jogadores por perto e envia para o chat."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Comando: /toggle <estado>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr ""
+#~ "Este comando define se a tecla enter deve alternar para o log do chat ou "
+#~ "se o log do chat fica oculto automaticamente."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<estado> pode ser \"1\", \"yes\" e \"true\" para ativar ou \"0\", \"no\" "
+#~ "e \"false\" para desativar."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Comando: /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "Este comando mostra o status da tecla enter."
+
+#~ msgid ""
+#~ "This command stops ignoring the given player if they are being ignored"
+#~ msgstr ""
+#~ "Este comando para de ignorar o jogador indicado se ele estiver sendo "
+#~ "ignorado"
+
+#~ msgid "Command: /where"
+#~ msgstr "Comando: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Mostra o nome do mapa atual."
+
+#~ msgid "Command: /who"
+#~ msgstr "Comando: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Exibe o número total de jogadores online."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Digite /help para uma lista de todos os comandos."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index edae91cea..3e8d780cb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: manaplus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2011-03-29 22:50+0000\n"
 "Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) <>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/being.cpp:489
@@ -53,10 +53,10 @@ msgstr "Conectando ao servidor do jogo"
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -91,539 +91,161 @@ msgstr "Registro cancelado com sucesso"
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "--Ajuda--"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Exibe esta ajuda"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Exibe o nome do mapa"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Exibe o número de usuários online"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Diz alguma coisa sobre você"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Limpa janela atual"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Envia uma messagem privada a um usuário"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > O mesmo que /msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > O mesmo que /msg"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Abre uma aba de chat com outro usuário"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > O mesmo que /query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-"/away > Diz que você está longe do teclado para quem te enviar uma mensagem "
-"privada ."
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Ignora um jogador"
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Deixa de ignorar um jogador"
-
-#: src/commandhandler.cpp:322
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/ignoreall > Ignorar todas abas abertas"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr "/erase > Apagar um jogador"
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr "/befriend > Ser amigo de um jogador"
-
-#: src/commandhandler.cpp:325
-msgid "/disregard > Disregard a player"
-msgstr "/disregard > Desconsiderar um jogador"
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr "/neutral > Deixar jogador neutro"
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Exibir todos os canais públicos"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Criar ou entrar em um canal"
-
-#: src/commandhandler.cpp:331
-msgid "/createparty > Create a new party"
-msgstr "/createparty > Cria um novo grupo"
-
-#: src/commandhandler.cpp:332
-msgid "/createguild > Create a new guild"
-msgstr "/createguild > Cria uma nova guilda"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Convidar um usuário para o grupo"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Determina se <enter> exibe a janela de chat"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Mostra a lista de jogadores presentes (envia para o log de chat, "
-"se estiver gravando)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Anúncio Global (Somente GM)"
-
-#: src/commandhandler.cpp:342
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/closeall > Fecha todas as abas abertas"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr "/all > Mostrar todos os seres visíveis na aba do Depurador"
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr "/move > Mover para a posição marcada"
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr "/navigate > Marcar um caminho para uma posição determinada"
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr "/target > Definir um alvo"
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr "/outfit > Usar roupa por índice"
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr "/emote > Mostrar emoticons por índice"
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr "/follow > Seguir jogador"
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr "/imitation > Imitar jogador"
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr "/heal > Curar jogador"
-
-#: src/commandhandler.cpp:354
-msgid "/mail > Send offline message to player"
-msgstr "/mail > Enviar menssagem a um jogador offline"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Para mais informações, digite /help <comando>."
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Comando: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Exibe uma lista de todos os comandos disponíveis."
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Comando: /help <comando>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Exibe o conteúdo de ajuda do <comando>"
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Comando: /announce <msg>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** Disponivel apenas para GM's ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Este comando envia a mensagem <msg> para todos os jogadores online."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Comando: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Este comando limpa a janela de chat."
-
-#: src/commandhandler.cpp:386
-msgid "Command: /ignore <player>"
-msgstr "Comando: /ignore <nome do jogador>"
-
-#: src/commandhandler.cpp:387
-msgid "This command ignores the given player regardless of current relations."
-msgstr ""
-"Este comando ignora o jogador indicado, independente de sua relação com o "
-"mesmo."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Comando: /join <canal>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Este comando faz você entrar em <canal>."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Se o <canal> não existe, ele será criado."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Comando: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Este comando exibe uma lista com todos os canais."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Comando: /me <mensagem>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Este comando diz aos outros o que eu estou (fazendo) <msg>."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Comando: /msg <nick> <mensagem>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Comando: /whisper <nick> <mensagem>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Comando: /w <nick> <mensagem>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Este comando envia o texto <mensagem> para <nick>."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Comando: /query <nick>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Comando: /q <nick>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Este comando cria uma aba para mensagens privadas entre você e <nick>."
-
-#: src/commandhandler.cpp:424
-msgid "Command: /away <afk reason>"
-msgstr "Comando: /away <motivo>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-"Este comando mostra que você está longe do teclado, indicando a razão dada."
-
-#: src/commandhandler.cpp:427
-msgid "Command: /away"
-msgstr "Comando: /away"
-
-#: src/commandhandler.cpp:428
-msgid "This command clears the away status and message."
-msgstr "Este comando limpa o status e a mensagem \"away\"."
-
-#: src/commandhandler.cpp:432
-msgid "Command: /createparty <name>"
-msgstr "Comando: /createparty <nome>"
-
-#: src/commandhandler.cpp:433
-msgid "This command creates a new party called <name>."
-msgstr "Este comando cria um novo grupo chamado <nome>."
-
-#: src/commandhandler.cpp:437
-msgid "Command: /createguild <name>"
-msgstr "Comando: /createguild <nome>"
-
-#: src/commandhandler.cpp:438
-msgid "This command creates a new guild called <name>."
-msgstr "Este comando cria uma nova guilda chamada <nome>"
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Comando: /party <nick>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Este comando convida <nick> para o seu grupo."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Comando: /present"
-
-#: src/commandhandler.cpp:450
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"Este comando busca uma lista de jogadores por perto e envia para o chat."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Comando: /toggle <estado>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Este comando define se a tecla enter deve alternar para o log do chat ou se "
-"o log do chat fica oculto automaticamente."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<estado> pode ser \"1\", \"yes\" e \"true\" para ativar ou \"0\", \"no\" e "
-"\"false\" para desativar."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Comando: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "Este comando mostra o status da tecla enter."
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-msgid "Command: /unignore <player>"
-msgstr "Comando: /unignore <jogador>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-"Este comando para de ignorar o jogador indicado se ele estiver sendo "
-"ignorado"
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Comando: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Mostra o nome do mapa atual."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Comando: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Exibe o número total de jogadores online."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Digite /help para uma lista de todos os comandos."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
-" já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
+"já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -633,7 +255,8 @@ msgstr[1] "%d segundos"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -720,12 +343,12 @@ msgstr "Resultado"
 msgid "Reset"
 msgstr "Resetar"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -733,50 +356,52 @@ msgstr "Preço: %s / Total: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr "-"
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Sair"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Máximo"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -926,7 +551,7 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Alterar email"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -945,80 +570,80 @@ msgstr "Nível %d"
 msgid "(empty)"
 msgstr "(vazio)"
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 msgid "default"
 msgstr "padrão"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr "preto"
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 msgid "red"
 msgstr "vermelho"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 msgid "green"
 msgstr "verde"
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 msgid "blue"
 msgstr "azul"
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr "ouro"
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 msgid "yellow"
 msgstr "amarelo"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 msgid "pink"
 msgstr "rosa"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr "roxo"
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr "cinza"
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 msgid "brown"
 msgstr "marrom"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 msgid "rainbow 1"
 msgstr "arco-íris 1"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 msgid "rainbow 2"
 msgstr "arco-íris 2"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 msgid "rainbow 3"
 msgstr "arco-íris 3"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -1142,7 +767,7 @@ msgstr "Entrada: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1159,11 +784,11 @@ msgstr "Equipamento"
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Fechar"
@@ -1246,39 +871,39 @@ msgstr "Retirar"
 msgid "Drop"
 msgstr "Descartar"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tudo"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra"
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda"
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Desconhecido"
 
@@ -1417,7 +1042,7 @@ msgstr "Fechar"
 msgid "Skip"
 msgstr "Passar"
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Login"
 
@@ -1438,11 +1063,11 @@ msgstr "Lembrar usuário"
 msgid "Update:"
 msgstr "Atualização:"
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 msgid "Change Server"
 msgstr "Trocar servidor"
 
@@ -1890,52 +1515,52 @@ msgstr "Escolha seu servidor"
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:229
-msgid "Server type:"
-msgstr "Tipo de servidor:"
-
-#: src/gui/serverdialog.cpp:232
+#: src/gui/serverdialog.cpp:231
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:246
+msgid "Server type:"
+msgstr "Tipo de servidor:"
+
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 msgid "Custom Server"
 msgstr "Servidor customizado"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -3367,8 +2992,7 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3381,33 +3005,33 @@ msgstr "Você não tem dinheiro suficiente."
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Concluído"
 
@@ -3635,6 +3259,11 @@ msgstr "Comando: /op <nick>"
 msgid "This command makes <nick> a channel operator."
 msgstr "Tornar <nick> operador do canal."
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3698,9 +3327,12 @@ msgstr "Comando: /ignore"
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Este comando ignora o outro jogador."
 
+#: src/gui/widgets/whispertab.cpp:128
+msgid "Command: /unignore <player>"
+msgstr "Comando: /unignore <jogador>"
+
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -4220,7 +3852,7 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 msgid "You see "
 msgstr "Você vê "
 
@@ -4806,18 +4438,18 @@ msgstr "Mensagem privada não pode ser enviada, %s está offline."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 msgid "MVP player."
 msgstr "Jogador VIP."
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 msgid "MVP player: "
 msgstr "Jogador VIP:  "
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Não há suporte para canais!"
 
@@ -5084,6 +4716,10 @@ msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Este comando convida <nick> para o seu grupo."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Este comando faz com que o jogador saia do grupo."
@@ -5119,8 +4755,7 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:106
 msgid "This command changes the party's experience sharing policy."
-msgstr ""
-"Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:108
 msgid ""
@@ -5137,8 +4772,7 @@ msgstr "Comando: /exp"
 #: src/net/tmwa/gui/partytab.cpp:112
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do "
-"grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:146 src/net/tmwa/partyhandler.cpp:287
 msgid "Item sharing enabled."
@@ -5360,15 +4994,13 @@ msgstr "Mensagem"
 
 #: src/net/tmwa/playerhandler.cpp:332
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
 #: src/net/tmwa/playerhandler.cpp:342
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
@@ -5561,3 +5193,287 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:155
 msgid "Unknown item"
 msgstr "Item desconhecido"
+
+#~ msgid "-- Help --"
+#~ msgstr "--Ajuda--"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Exibe esta ajuda"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Exibe o nome do mapa"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Exibe o número de usuários online"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Diz alguma coisa sobre você"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Limpa janela atual"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Envia uma messagem privada a um usuário"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > O mesmo que /msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > O mesmo que /msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr "/query > Abre uma aba de chat com outro usuário"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > O mesmo que /query"
+
+#~ msgid "/away > Tell the other whispering players you're away from keyboard."
+#~ msgstr ""
+#~ "/away > Diz que você está longe do teclado para quem te enviar uma "
+#~ "mensagem privada ."
+
+#~ msgid "/ignore > ignore a player"
+#~ msgstr "/ignore > Ignora um jogador"
+
+#~ msgid "/unignore > stop ignoring a player"
+#~ msgstr "/unignore > Deixa de ignorar um jogador"
+
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/ignoreall > Ignorar todas abas abertas"
+
+#~ msgid "/erase > Erase a player"
+#~ msgstr "/erase > Apagar um jogador"
+
+#~ msgid "/befriend > Be friend a player"
+#~ msgstr "/befriend > Ser amigo de um jogador"
+
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "/disregard > Desconsiderar um jogador"
+
+#~ msgid "/neutral > Neutral a player"
+#~ msgstr "/neutral > Deixar jogador neutro"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Exibir todos os canais públicos"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Criar ou entrar em um canal"
+
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/createparty > Cria um novo grupo"
+
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/createguild > Cria uma nova guilda"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Convidar um usuário para o grupo"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr "/toggle > Determina se <enter> exibe a janela de chat"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Mostra a lista de jogadores presentes (envia para o log de "
+#~ "chat, se estiver gravando)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Anúncio Global (Somente GM)"
+
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/closeall > Fecha todas as abas abertas"
+
+#~ msgid "/all > Show all visible beings in debug tab"
+#~ msgstr "/all > Mostrar todos os seres visíveis na aba do Depurador"
+
+#~ msgid "/move > Move to given position"
+#~ msgstr "/move > Mover para a posição marcada"
+
+#~ msgid "/navigate > Draw path to given position"
+#~ msgstr "/navigate > Marcar um caminho para uma posição determinada"
+
+#~ msgid "/target > Set target to being"
+#~ msgstr "/target > Definir um alvo"
+
+#~ msgid "/outfit > Wear outfit by index"
+#~ msgstr "/outfit > Usar roupa por índice"
+
+#~ msgid "/emote > Show emote by index"
+#~ msgstr "/emote > Mostrar emoticons por índice"
+
+#~ msgid "/follow > Follow player"
+#~ msgstr "/follow > Seguir jogador"
+
+#~ msgid "/imitation > Imitate player"
+#~ msgstr "/imitation > Imitar jogador"
+
+#~ msgid "/heal > Heal player"
+#~ msgstr "/heal > Curar jogador"
+
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/mail > Enviar menssagem a um jogador offline"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Para mais informações, digite /help <comando>."
+
+#~ msgid "Command: /help"
+#~ msgstr "Comando: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Exibe uma lista de todos os comandos disponíveis."
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Comando: /help <comando>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Exibe o conteúdo de ajuda do <comando>"
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Comando: /announce <msg>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** Disponivel apenas para GM's ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr "Este comando envia a mensagem <msg> para todos os jogadores online."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Comando: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Este comando limpa a janela de chat."
+
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Comando: /ignore <nome do jogador>"
+
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr ""
+#~ "Este comando ignora o jogador indicado, independente de sua relação com o "
+#~ "mesmo."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Comando: /join <canal>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Este comando faz você entrar em <canal>."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Se o <canal> não existe, ele será criado."
+
+#~ msgid "Command: /list"
+#~ msgstr "Comando: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Este comando exibe uma lista com todos os canais."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Comando: /me <mensagem>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Este comando diz aos outros o que eu estou (fazendo) <msg>."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Comando: /msg <nick> <mensagem>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Comando: /whisper <nick> <mensagem>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Comando: /w <nick> <mensagem>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Este comando envia o texto <mensagem> para <nick>."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Comando: /query <nick>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Comando: /q <nick>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Este comando cria uma aba para mensagens privadas entre você e <nick>."
+
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Comando: /away <motivo>"
+
+#~ msgid "This command tells you're away from keyboard with the given reason."
+#~ msgstr ""
+#~ "Este comando mostra que você está longe do teclado, indicando a razão "
+#~ "dada."
+
+#~ msgid "Command: /away"
+#~ msgstr "Comando: /away"
+
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Este comando limpa o status e a mensagem \"away\"."
+
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Comando: /createparty <nome>"
+
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Este comando cria um novo grupo chamado <nome>."
+
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Comando: /createguild <nome>"
+
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Este comando cria uma nova guilda chamada <nome>"
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Comando: /party <nick>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Comando: /present"
+
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "Este comando busca uma lista de jogadores por perto e envia para o chat."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Comando: /toggle <estado>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr ""
+#~ "Este comando define se a tecla enter deve alternar para o log do chat ou "
+#~ "se o log do chat fica oculto automaticamente."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<estado> pode ser \"1\", \"yes\" e \"true\" para ativar ou \"0\", \"no\" "
+#~ "e \"false\" para desativar."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Comando: /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "Este comando mostra o status da tecla enter."
+
+#~ msgid ""
+#~ "This command stops ignoring the given player if they are being ignored"
+#~ msgstr ""
+#~ "Este comando para de ignorar o jogador indicado se ele estiver sendo "
+#~ "ignorado"
+
+#~ msgid "Command: /where"
+#~ msgstr "Comando: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Mostra o nome do mapa atual."
+
+#~ msgid "Command: /who"
+#~ msgstr "Comando: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Exibe o número total de jogadores online."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Digite /help para uma lista de todos os comandos."
diff --git a/po/ru.po b/po/ru.po
index 69fedb696..8beac5c4f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,20 +2,21 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: manaplus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2011-03-29 19:15+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian <>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: src/being.cpp:489
 msgid "dodge"
@@ -53,10 +54,10 @@ msgstr "Подключение к игровому серверу"
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -91,507 +92,133 @@ msgstr "Регистрация удалена"
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Неизвестная команда."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "-- Помощь --"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Отображает этот текст"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Отображает имя карты"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Отображает количество пользователей он-лайн"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Расскажите что-нибудь о себе"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Очищает это окно"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Послать личное сообщение пользователю"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Аналог команды msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > Аналог команды msg"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query> Создает вкладку для чата с пользователем."
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q> Аналог query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr "/away > Сообщить тем, с кем вы перешептываетесь, что вы отошли."
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Игнорировать игрока"
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Убрать пользователя из игнора"
-
-#: src/commandhandler.cpp:322
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/ignoreall > Игнорировать все вкладки с перешептыванием"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr "/erase > Удалить игрока"
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr "/befriend > Подружиться"
-
-#: src/commandhandler.cpp:325
-msgid "/disregard > Disregard a player"
-msgstr "/disregard > не придавать значения"
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr "/neutral > Относиться нейтрально"
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Показать список каналов"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Создать или присоединиться к каналу"
-
-#: src/commandhandler.cpp:331
-msgid "/createparty > Create a new party"
-msgstr "/createparty > Создать группу"
-
-#: src/commandhandler.cpp:332
-msgid "/createguild > Create a new guild"
-msgstr "/createguild > Создать гильдию"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Пригласить пользователя в группу"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-"/toggle -> Определяет появление строки ввода текста в чат по нажатию "
-"<return>"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Показывает список игроков он-лайн (также извещает в окне чата, "
-"если включен лог)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Глобальное извещение (доступно только ГМ)"
-
-#: src/commandhandler.cpp:342
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/closeall > Закрыть все вкладки перешептывания"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr "/all > Показать всех видимых существ на вкладке отладки"
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr "/move > Идти к заданной позиции"
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr "/navigate > Нарисовать путь к заданной позиции"
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr "/target > Прицелиться в существо"
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr "/outfit > Одеть наряд под указанным номером"
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr "/emote > Показать смайлик под указанным номером"
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr "/follow > Следовать за игроком"
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr "/imitation > Имитировать игрока"
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr "/heal > Лечить игрока"
-
-#: src/commandhandler.cpp:354
-msgid "/mail > Send offline message to player"
-msgstr "/mail > Послать оффлайн сообщение пользователю"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Для более детальной информации введите: /help <команда>"
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Команда: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Эта команда показывает список доступных команд"
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Команда: /help <команда>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Эта команда показывает помощь по <команде>."
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Команда: /announce <сообщение>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** доступно только для GM ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Эта команда посылает <сообщение> всем игрокам в сети."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Команда: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Эта команда очищает лог чата."
-
-#: src/commandhandler.cpp:386
-msgid "Command: /ignore <player>"
-msgstr "Команда: /ignore <игрок>"
-
-#: src/commandhandler.cpp:387
-msgid "This command ignores the given player regardless of current relations."
-msgstr ""
-"Эта команда игнорирует указанного игрока независимо от текущего статуса "
-"взаимоотношений"
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Команда: /join <канал>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Команда для входа на <канал>."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Если <канал> не существует, он будет создан."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Команда: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Эта команда показывает список всех каналов."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Команда: /me <сообщение>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Эта команда покажет другим игрокам, что вы (делаете) <сообщение>."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Команда: /msg <имя персонажа> <сообщение>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Команда: /whisper <имя персонажа> <сообщение>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Команда: /w <ник> <сообщение>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Команда: /query <имя персонажа>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Команда: /q <имя персонажа>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Эта команда создаст закладку для личного общения между вами и <имя игрока>."
-
-#: src/commandhandler.cpp:424
-msgid "Command: /away <afk reason>"
-msgstr "Команда: /away <причина отсутствия у компьютера>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr "Команда сообщает, что вы отошли по указанной причине."
-
-#: src/commandhandler.cpp:427
-msgid "Command: /away"
-msgstr "Команда: /away"
-
-#: src/commandhandler.cpp:428
-msgid "This command clears the away status and message."
-msgstr "Эта команда очищает статус и сообщение отсутствия."
-
-#: src/commandhandler.cpp:432
-msgid "Command: /createparty <name>"
-msgstr "Command: /createparty <имя_группы>"
-
-#: src/commandhandler.cpp:433
-msgid "This command creates a new party called <name>."
-msgstr "Эта Команда создает группу под названием <имя_группы>."
-
-#: src/commandhandler.cpp:437
-msgid "Command: /createguild <name>"
-msgstr "Команда: /createparty <имя_гильдии>"
-
-#: src/commandhandler.cpp:438
-msgid "This command creates a new guild called <name>."
-msgstr "Эта Команда создает гильдию под названием <имя_гильдии>."
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Команда: /party <имя>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Эта команда приглашает <имя персонажа> к вам в группу."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Команда: /present"
-
-#: src/commandhandler.cpp:450
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr "Эта команда выводит список видимых игроков в чат."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Команда: /toggle <режим>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Эта Команда устанавливает, будет ли нажатие клавиши Enter переключать лог "
-"чата или же он (лог) будет выключен автоматически."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<режим> может быть \"1\", \"yes\", \"true\" дабы включить опцию или \"0\", "
-"\"no\", \"false\" чтобы выключить."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Команда: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "Эта команда показывает статус переключения строки ввода в чат"
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-msgid "Command: /unignore <player>"
-msgstr "Команда: /unignore <игрок>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr "Эта команда улаляет игрока из списка игнорирования"
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Команда: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Эта команда показывает имя текущей карты."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Команда: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Эта команда показывает число пользователей в сети на данный момент."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Введите /help для получения списка команд."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Нельзя отправлять пустые сообщения!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
-" уже создана, или этот игрок вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
+"уже создана, или этот игрок вы сами."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Запрос на присоединение к каналу %s."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Не указано название группы"
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 msgid "Guild name is missing."
 msgstr "Не задано имя гильдии."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr "Пожалуйста укажите имя"
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "Enter переключает вас на окно чата."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 msgid "friend"
 msgstr "друг"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 msgid "neutral"
 msgstr "нейтральный"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорируется!"
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из списка игнорирования!"
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 msgid "Player successfully erased!"
 msgstr "Игрок удален!"
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -599,7 +226,7 @@ msgstr[0] "%d неделя"
 msgstr[1] "%d недели"
 msgstr[2] "%d недель"
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -607,7 +234,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -615,7 +242,7 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -623,7 +250,7 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -634,7 +261,9 @@ msgstr[2] "%d секунд"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
+msgstr ""
+"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
+"\"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -721,12 +350,12 @@ msgstr "Результат"
 msgid "Reset"
 msgstr "Сбросить"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Купить"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -734,50 +363,52 @@ msgstr "Цена: %s / Всего: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr "-"
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Выход"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Макс"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Магазин"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Продать"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -927,7 +558,7 @@ msgstr "Удалить регистрацию"
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -946,80 +577,80 @@ msgstr "Уровень: %d"
 msgid "(empty)"
 msgstr "(пусто)"
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 msgid "default"
 msgstr "По умолчанию"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr "черный"
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 msgid "red"
 msgstr "красный"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 msgid "green"
 msgstr "зеленый"
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 msgid "blue"
 msgstr "синий"
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr "золотой"
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 msgid "yellow"
 msgstr "желтый"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 msgid "pink"
 msgstr "розовый"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr "фиолетовый"
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr "серый"
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 msgid "brown"
 msgstr "коричневый"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 msgid "rainbow 1"
 msgstr "радуга 1"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 msgid "rainbow 2"
 msgstr "радуга 2"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 msgid "rainbow 3"
 msgstr "радуга 3"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -1143,7 +774,7 @@ msgstr "Вх.: %d байт/сек."
 msgid "Out: %d bytes/s"
 msgstr "Исх.: %d байт/сек."
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1160,11 +791,11 @@ msgstr "Снаряжение"
 msgid "Unequip"
 msgstr "Снять"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Помощь"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Закрыть"
@@ -1247,39 +878,39 @@ msgstr "Получить"
 msgid "Drop"
 msgstr "Бросить"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Всё"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Укажите количество вещей для хранения."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Укажите количество вещей для изъятия."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Добавить в список покупки."
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Добавить в список продажи."
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Неизвестно."
 
@@ -1418,7 +1049,7 @@ msgstr "Авт. закрыть"
 msgid "Skip"
 msgstr "Пропустить"
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Вход"
 
@@ -1439,11 +1070,11 @@ msgstr "Запомнить логин"
 msgid "Update:"
 msgstr "Обновления:"
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Регистрация"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 msgid "Change Server"
 msgstr "Сменить сервер"
 
@@ -1891,52 +1522,52 @@ msgstr "Выберите сервер"
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/gui/serverdialog.cpp:229
-msgid "Server type:"
-msgstr "Тип:"
-
-#: src/gui/serverdialog.cpp:232
+#: src/gui/serverdialog.cpp:231
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:246
+msgid "Server type:"
+msgstr "Тип:"
+
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 msgid "Connect"
 msgstr "Соединиться"
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 msgid "Custom Server"
 msgstr "Добавить"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Следует указать адрес и порт сервера."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -2532,8 +2163,8 @@ msgstr "Нет"
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
-" удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
+"удалось!"
 
 #: src/gui/setup_video.cpp:535
 msgid ""
@@ -3370,8 +3001,7 @@ msgid "Change"
 msgstr "Сменить"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
@@ -3385,33 +3015,33 @@ msgstr "У вас недостаточно денег"
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Играть"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен!"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Завершено"
 
@@ -3639,6 +3269,11 @@ msgstr "Команда: /op <имя>"
 msgid "This command makes <nick> a channel operator."
 msgstr "Эта Команда делает <пользователь> оператором канала."
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3701,12 +3336,15 @@ msgstr "Команда: /ignore"
 #: src/gui/widgets/whispertab.cpp:123
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
-" отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
+"отношений с ним."
+
+#: src/gui/widgets/whispertab.cpp:128
+msgid "Command: /unignore <player>"
+msgstr "Команда: /unignore <игрок>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
 #: src/gui/windowmenu.cpp:62
@@ -4226,7 +3864,7 @@ msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 msgid "You see "
 msgstr "Вы видите "
 
@@ -4753,8 +4391,7 @@ msgstr "Неизвестная ошибка сервера чата."
 
 #: src/net/tmwa/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
 #: src/net/tmwa/charserverhandler.cpp:176 src/net/tmwa/loginhandler.cpp:188
 msgid "Wrong name."
@@ -4814,18 +4451,18 @@ msgstr "Сообщение не может быть отправлено, %s о�
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Приватное сообщение не может быть послано, %s  игнорирует его."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 msgid "MVP player."
 msgstr "Игрок MVP."
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 msgid "MVP player: "
 msgstr "Игрок MVP: "
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Каналы не поддерживаются!"
 
@@ -5092,6 +4729,10 @@ msgstr ""
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Показать/Скрыть текущее состояние распределения опыта в группе"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Эта команда приглашает <имя персонажа> к вам в группу."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Эта Команда заставляет игрока покинуть группу"
@@ -5108,7 +4749,8 @@ msgstr "Команда изменяет политику разделения п
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr "<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
+msgstr ""
+"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
 
 #: src/net/tmwa/gui/partytab.cpp:99
 msgid "Command: /item"
@@ -5131,8 +4773,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий"
-" опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
+"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий "
+"опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
 
 #: src/net/tmwa/gui/partytab.cpp:111
 msgid "Command: /exp"
@@ -5359,15 +5001,13 @@ msgstr "Сообщение"
 
 #: src/net/tmwa/playerhandler.cpp:332
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Вы несете груз больший, чем половина вашей грузоподъемности. Не удалось "
 "восстановить здоровье."
 
 #: src/net/tmwa/playerhandler.cpp:342
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Вы несете груз меньше, чем половина вашей грузоподъемности. Вы можете "
 "восстановить здоровье."
@@ -5560,3 +5200,283 @@ msgstr "Мана %+d"
 #: src/resources/itemdb.cpp:155
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
+
+#~ msgid "-- Help --"
+#~ msgstr "-- Помощь --"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Отображает этот текст"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Отображает имя карты"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Отображает количество пользователей он-лайн"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Расскажите что-нибудь о себе"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Очищает это окно"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Послать личное сообщение пользователю"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > Аналог команды msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > Аналог команды msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr "/query> Создает вкладку для чата с пользователем."
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q> Аналог query"
+
+#~ msgid "/away > Tell the other whispering players you're away from keyboard."
+#~ msgstr "/away > Сообщить тем, с кем вы перешептываетесь, что вы отошли."
+
+#~ msgid "/ignore > ignore a player"
+#~ msgstr "/ignore > Игнорировать игрока"
+
+#~ msgid "/unignore > stop ignoring a player"
+#~ msgstr "/unignore > Убрать пользователя из игнора"
+
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/ignoreall > Игнорировать все вкладки с перешептыванием"
+
+#~ msgid "/erase > Erase a player"
+#~ msgstr "/erase > Удалить игрока"
+
+#~ msgid "/befriend > Be friend a player"
+#~ msgstr "/befriend > Подружиться"
+
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "/disregard > не придавать значения"
+
+#~ msgid "/neutral > Neutral a player"
+#~ msgstr "/neutral > Относиться нейтрально"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Показать список каналов"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Создать или присоединиться к каналу"
+
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/createparty > Создать группу"
+
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/createguild > Создать гильдию"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Пригласить пользователя в группу"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr ""
+#~ "/toggle -> Определяет появление строки ввода текста в чат по нажатию "
+#~ "<return>"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Показывает список игроков он-лайн (также извещает в окне чата, "
+#~ "если включен лог)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Глобальное извещение (доступно только ГМ)"
+
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/closeall > Закрыть все вкладки перешептывания"
+
+#~ msgid "/all > Show all visible beings in debug tab"
+#~ msgstr "/all > Показать всех видимых существ на вкладке отладки"
+
+#~ msgid "/move > Move to given position"
+#~ msgstr "/move > Идти к заданной позиции"
+
+#~ msgid "/navigate > Draw path to given position"
+#~ msgstr "/navigate > Нарисовать путь к заданной позиции"
+
+#~ msgid "/target > Set target to being"
+#~ msgstr "/target > Прицелиться в существо"
+
+#~ msgid "/outfit > Wear outfit by index"
+#~ msgstr "/outfit > Одеть наряд под указанным номером"
+
+#~ msgid "/emote > Show emote by index"
+#~ msgstr "/emote > Показать смайлик под указанным номером"
+
+#~ msgid "/follow > Follow player"
+#~ msgstr "/follow > Следовать за игроком"
+
+#~ msgid "/imitation > Imitate player"
+#~ msgstr "/imitation > Имитировать игрока"
+
+#~ msgid "/heal > Heal player"
+#~ msgstr "/heal > Лечить игрока"
+
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/mail > Послать оффлайн сообщение пользователю"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Для более детальной информации введите: /help <команда>"
+
+#~ msgid "Command: /help"
+#~ msgstr "Команда: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Эта команда показывает список доступных команд"
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Команда: /help <команда>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Эта команда показывает помощь по <команде>."
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Команда: /announce <сообщение>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** доступно только для GM ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr "Эта команда посылает <сообщение> всем игрокам в сети."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Команда: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Эта команда очищает лог чата."
+
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Команда: /ignore <игрок>"
+
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr ""
+#~ "Эта команда игнорирует указанного игрока независимо от текущего статуса "
+#~ "взаимоотношений"
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Команда: /join <канал>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Команда для входа на <канал>."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Если <канал> не существует, он будет создан."
+
+#~ msgid "Command: /list"
+#~ msgstr "Команда: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Эта команда показывает список всех каналов."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Команда: /me <сообщение>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Эта команда покажет другим игрокам, что вы (делаете) <сообщение>."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Команда: /msg <имя персонажа> <сообщение>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Команда: /whisper <имя персонажа> <сообщение>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Команда: /w <ник> <сообщение>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Команда: /query <имя персонажа>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Команда: /q <имя персонажа>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Эта команда создаст закладку для личного общения между вами и <имя "
+#~ "игрока>."
+
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Команда: /away <причина отсутствия у компьютера>"
+
+#~ msgid "This command tells you're away from keyboard with the given reason."
+#~ msgstr "Команда сообщает, что вы отошли по указанной причине."
+
+#~ msgid "Command: /away"
+#~ msgstr "Команда: /away"
+
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Эта команда очищает статус и сообщение отсутствия."
+
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Command: /createparty <имя_группы>"
+
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Эта Команда создает группу под названием <имя_группы>."
+
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Команда: /createparty <имя_гильдии>"
+
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Эта Команда создает гильдию под названием <имя_гильдии>."
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Команда: /party <имя>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Команда: /present"
+
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr "Эта команда выводит список видимых игроков в чат."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Команда: /toggle <режим>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr ""
+#~ "Эта Команда устанавливает, будет ли нажатие клавиши Enter переключать лог "
+#~ "чата или же он (лог) будет выключен автоматически."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<режим> может быть \"1\", \"yes\", \"true\" дабы включить опцию или "
+#~ "\"0\", \"no\", \"false\" чтобы выключить."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Команда: /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "Эта команда показывает статус переключения строки ввода в чат"
+
+#~ msgid ""
+#~ "This command stops ignoring the given player if they are being ignored"
+#~ msgstr "Эта команда улаляет игрока из списка игнорирования"
+
+#~ msgid "Command: /where"
+#~ msgstr "Команда: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Эта команда показывает имя текущей карты."
+
+#~ msgid "Command: /who"
+#~ msgstr "Команда: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Эта команда показывает число пользователей в сети на данный момент."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Введите /help для получения списка команд."
diff --git a/po/sv.po b/po/sv.po
index 8e16bc397..b5a9d71a5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-03-29 21:45+0300\n"
+"POT-Creation-Date: 2011-04-06 20:33+0300\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -60,10 +60,10 @@ msgstr "Ansluter till kartservern..."
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1200
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:186 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:360 src/gui/unregisterdialog.cpp:135
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
@@ -102,426 +102,34 @@ msgstr "Avregistrera"
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1330 src/client.cpp:1360 src/client.cpp:1404
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1533
+#: src/client.cpp:1535
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ogiltig uppdateringsvärd: "
 
-#: src/client.cpp:1567 src/client.cpp:1573
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: src/client.cpp:1594
+#: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:271 src/commandhandler.cpp:484
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Okänt kommando."
 
-#: src/commandhandler.cpp:301
-msgid "-- Help --"
-msgstr "-- Hjälp --"
-
-#: src/commandhandler.cpp:302
-msgid "/help > Display this help"
-msgstr "/help > Visa den här hjälpen"
-
-#: src/commandhandler.cpp:304
-msgid "/where > Display map name"
-msgstr "/where > Visa kartans namn"
-
-#: src/commandhandler.cpp:305
-msgid "/who > Display number of online users"
-msgstr "/who > Visa antalet inloggade spelare"
-
-#: src/commandhandler.cpp:306
-msgid "/me > Tell something about yourself"
-msgstr "/me > Säg något om dig själv"
-
-#: src/commandhandler.cpp:308
-msgid "/clear > Clears this window"
-msgstr "/clear > Tömmer det här fönstret"
-
-#: src/commandhandler.cpp:310
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Skickar ett privat meddelande till en spelare"
-
-#: src/commandhandler.cpp:311
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias för msg"
-
-#: src/commandhandler.cpp:312
-msgid "/w > Alias of msg"
-msgstr "/w > Alias för msg"
-
-#: src/commandhandler.cpp:313
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Skapar en flik för privata meddelanden med en annan spelare"
-
-#: src/commandhandler.cpp:315
-msgid "/q > Alias of query"
-msgstr "/q > Alias för query"
-
-#: src/commandhandler.cpp:317
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-
-#: src/commandhandler.cpp:320
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:321
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:322
-#, fuzzy
-msgid "/ignoreall > Ignore all opened whisper tabs"
-msgstr "/close > Stänger viskningsfliken"
-
-#: src/commandhandler.cpp:323
-msgid "/erase > Erase a player"
-msgstr ""
-
-#: src/commandhandler.cpp:324
-msgid "/befriend > Be friend a player"
-msgstr ""
-
-#: src/commandhandler.cpp:325
-#, fuzzy
-msgid "/disregard > Disregard a player"
-msgstr "@@disregard|Strunta i %s@@"
-
-#: src/commandhandler.cpp:326
-msgid "/neutral > Neutral a player"
-msgstr ""
-
-#: src/commandhandler.cpp:328
-msgid "/list > Display all public channels"
-msgstr "/list > Visa alla offentliga chattkanaler"
-
-#: src/commandhandler.cpp:329
-msgid "/join > Join or create a channel"
-msgstr "/join > Gå med i eller skapa en chattkanal"
-
-#: src/commandhandler.cpp:331
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Skapa ny grupp"
-
-#: src/commandhandler.cpp:332
-#, fuzzy
-msgid "/createguild > Create a new guild"
-msgstr "/create > Skapa ny grupp"
-
-#: src/commandhandler.cpp:333
-msgid "/party > Invite a user to party"
-msgstr "/party > Bjud in en spelare till din grupp"
-
-#: src/commandhandler.cpp:335
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Avgör huruvida <retur> aktiverar chattfönstret eller ej"
-
-#: src/commandhandler.cpp:337
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Lista närvarande spelare (sänds till chattloggen om loggning är "
-"aktiverad)"
-
-#: src/commandhandler.cpp:340
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globalt meddelande (endast för GM)"
-
-#: src/commandhandler.cpp:342
-#, fuzzy
-msgid "/closeall > Close all opened whisper tabs"
-msgstr "/close > Stänger viskningsfliken"
-
-#: src/commandhandler.cpp:344
-msgid "/all > Show all visible beings in debug tab"
-msgstr ""
-
-#: src/commandhandler.cpp:346
-msgid "/move > Move to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:347
-msgid "/navigate > Draw path to given position"
-msgstr ""
-
-#: src/commandhandler.cpp:348
-msgid "/target > Set target to being"
-msgstr ""
-
-#: src/commandhandler.cpp:349
-msgid "/outfit > Wear outfit by index"
-msgstr ""
-
-#: src/commandhandler.cpp:350
-msgid "/emote > Show emote by index"
-msgstr ""
-
-#: src/commandhandler.cpp:351
-msgid "/follow > Follow player"
-msgstr ""
-
-#: src/commandhandler.cpp:352
-msgid "/imitation > Imitate player"
-msgstr ""
-
-#: src/commandhandler.cpp:353
-msgid "/heal > Heal player"
-msgstr ""
-
-#: src/commandhandler.cpp:354
-#, fuzzy
-msgid "/mail > Send offline message to player"
-msgstr "/msg > Skickar ett privat meddelande till en spelare"
-
-#: src/commandhandler.cpp:358
-msgid "For more information, type /help <command>."
-msgstr "Skriv /help <kommando> för mer information."
-
-#: src/commandhandler.cpp:362
-msgid "Command: /help"
-msgstr "Kommando: /help"
-
-#: src/commandhandler.cpp:363
-msgid "This command displays a list of all commands available."
-msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon."
-
-#: src/commandhandler.cpp:365
-msgid "Command: /help <command>"
-msgstr "Kommando: /help <kommando>"
-
-#: src/commandhandler.cpp:366
-msgid "This command displays help on <command>."
-msgstr "Det här kommandot ger mer information om <kommando>."
-
-#: src/commandhandler.cpp:374
-msgid "Command: /announce <msg>"
-msgstr "Kommando: /announce <text>"
-
-#: src/commandhandler.cpp:375
-msgid "*** only available to a GM ***"
-msgstr "*** endast en GM kan använda det här kommandot ***"
-
-#: src/commandhandler.cpp:376
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Det här kommandot skickar meddelandet <text> till alla inloggade spelare."
-
-#: src/commandhandler.cpp:381
-msgid "Command: /clear"
-msgstr "Kommando: /clear"
-
-#: src/commandhandler.cpp:382
-msgid "This command clears the chat log of previous chat."
-msgstr "Det här kommandot tömmer chattloggen."
-
-#: src/commandhandler.cpp:386
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Kommando: /item <alternativ>"
-
-#: src/commandhandler.cpp:387
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
-
-#: src/commandhandler.cpp:392
-msgid "Command: /join <channel>"
-msgstr "Kommando: /join <chattkanal>"
-
-#: src/commandhandler.cpp:393
-msgid "This command makes you enter <channel>."
-msgstr "Det här kommandot låter dig gå in i <chattkanal>."
-
-#: src/commandhandler.cpp:394
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Om <chattkanal> inte existerar, skapas den."
-
-#: src/commandhandler.cpp:398
-msgid "Command: /list"
-msgstr "Kommando: /list"
-
-#: src/commandhandler.cpp:399
-msgid "This command shows a list of all channels."
-msgstr "Det här kommandot visar en lista över alla chattkanaler."
-
-#: src/commandhandler.cpp:403
-msgid "Command: /me <message>"
-msgstr "Kommando: /me <meddelande>"
-
-#: src/commandhandler.cpp:404
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Det här kommandet berättar för andra att du är/gör <meddelande>."
-
-#: src/commandhandler.cpp:408
-msgid "Command: /msg <nick> <message>"
-msgstr "Kommando: /msg <spelare> <meddelande>"
-
-#: src/commandhandler.cpp:409
-msgid "Command: /whisper <nick> <message>"
-msgstr "Kommando: /whisper <spelare> <meddelande>"
-
-#: src/commandhandler.cpp:410
-msgid "Command: /w <nick> <message>"
-msgstr "Kommando: /w <spelare> <meddelande>"
-
-#: src/commandhandler.cpp:411
-msgid "This command sends the text <message> to <nick>."
-msgstr "Det här kommandot skickar <meddelande> till <spelare>."
-
-#: src/commandhandler.cpp:412 src/commandhandler.cpp:444
-#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Om <spelare> innehåller mellanslag, måste du sätta citattecken (\") runt det."
-
-#: src/commandhandler.cpp:417
-msgid "Command: /query <nick>"
-msgstr "Kommando: /query <spelare>"
-
-#: src/commandhandler.cpp:418
-msgid "Command: /q <nick>"
-msgstr "Kommando: /q <spelare>"
-
-#: src/commandhandler.cpp:419
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Det här kommandot försöker att skapa en flik för viskningar mellan dig och "
-"<spelare>."
-
-#: src/commandhandler.cpp:424
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Kommando: /w <spelare> <meddelande>"
-
-#: src/commandhandler.cpp:425
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
-
-#: src/commandhandler.cpp:427
-#, fuzzy
-msgid "Command: /away"
-msgstr "Kommando: /who"
-
-#: src/commandhandler.cpp:428
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Det här kommandot sätter ämnet till <meddelande>."
-
-#: src/commandhandler.cpp:432
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Kommando: /create <grupp>"
-
-#: src/commandhandler.cpp:433
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Dessa kommandon skapar <grupp>."
-
-#: src/commandhandler.cpp:437
-#, fuzzy
-msgid "Command: /createguild <name>"
-msgstr "Kommando: /create <grupp>"
-
-#: src/commandhandler.cpp:438
-#, fuzzy
-msgid "This command creates a new guild called <name>."
-msgstr "Dessa kommandon skapar <grupp>."
-
-#: src/commandhandler.cpp:442
-msgid "Command: /party <nick>"
-msgstr "Kommando: /party <spelare>"
-
-#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:82
-msgid "This command invites <nick> to party with you."
-msgstr "Det här kommandot bjuder in <spelare> till din grupp."
-
-#: src/commandhandler.cpp:449
-msgid "Command: /present"
-msgstr "Kommando: /present"
-
-#: src/commandhandler.cpp:450
-#, fuzzy
-msgid ""
-"This command gets a list of players within hearing and sends it to chat log."
-msgstr ""
-"Det här kommandot ger en lista över spelare som finns inom höravstånd, om "
-"loggning av chatten är aktiverad skickas listan till loggfilen."
-
-#: src/commandhandler.cpp:455
-msgid "Command: /toggle <state>"
-msgstr "Kommando: /toggle <tillstånd>"
-
-#: src/commandhandler.cpp:456
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
-"Det här kommandot anger huruvida retur visar/döljerer chattfönstret eller om "
-"chattfönstret stänger sig själv."
-
-#: src/commandhandler.cpp:459
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<tillstånd> kan vara ”1”, ”yes” eller ”true” för att använda returtangenten "
-"eller ”0”, ”no” eller ”false” för att använda automatisk stängning."
-
-#: src/commandhandler.cpp:462
-msgid "Command: /toggle"
-msgstr "Kommando: /toggle"
-
-#: src/commandhandler.cpp:463
-msgid "This command displays the return toggle status."
-msgstr "Det här kommandot visar tillståndet för huruvida retur används."
-
-#: src/commandhandler.cpp:467 src/gui/widgets/whispertab.cpp:128
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Kommando: /item <alternativ>"
-
-#: src/commandhandler.cpp:468
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-
-#: src/commandhandler.cpp:473
-msgid "Command: /where"
-msgstr "Kommando: /where"
-
-#: src/commandhandler.cpp:474
-msgid "This command displays the name of the current map."
-msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
-
-#: src/commandhandler.cpp:478
-msgid "Command: /who"
-msgstr "Kommando: /who"
-
-#: src/commandhandler.cpp:479
-msgid "This command displays the number of players currently online."
-msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
-
-#: src/commandhandler.cpp:485
-msgid "Type /help for a list of commands."
-msgstr "Skriv /help för en lista med kommandon."
-
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:372
 msgid "Cannot send empty whispers!"
 msgstr "Behöver en text att viska!"
 
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:380
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -530,133 +138,133 @@ msgstr ""
 "Kan inte skapa viskningsflik för smeknamnet \"%s\"! Antingen existerar "
 "fliken redan eller så försöker du viska till dig själv."
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:400
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Skickar förfrågan att gå in i chattkanalen %s."
 
-#: src/commandhandler.cpp:597 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Du måste ange gruppens namn."
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:427
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Du måste ange gruppens namn."
 
-#: src/commandhandler.cpp:621 src/commandhandler.cpp:728
-#: src/commandhandler.cpp:769 src/commandhandler.cpp:799
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Return toggles chat."
 msgstr "Retur visar/döljer chattfönstret."
 
-#: src/commandhandler.cpp:662
+#: src/commandhandler.cpp:481
 msgid "Message closes chat."
 msgstr "Meddelande stänger chattfönstret."
 
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:492
 msgid "Return now toggles chat."
 msgstr "Retur växlar nu chattfönstrets synlighet."
 
-#: src/commandhandler.cpp:679
+#: src/commandhandler.cpp:498
 msgid "Message now closes chat."
 msgstr "Meddelanden stänger nu chattfönstret."
 
-#: src/commandhandler.cpp:707
+#: src/commandhandler.cpp:526
 #, fuzzy
 msgid "friend"
 msgstr "Vän"
 
-#: src/commandhandler.cpp:712
+#: src/commandhandler.cpp:531
 #, fuzzy
 msgid "disregarded"
 msgstr "Förbisedd"
 
-#: src/commandhandler.cpp:717
+#: src/commandhandler.cpp:536
 #, fuzzy
 msgid "neutral"
 msgstr "Neutral"
 
-#: src/commandhandler.cpp:736
+#: src/commandhandler.cpp:555
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/commandhandler.cpp:750
+#: src/commandhandler.cpp:569
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Grupp skapad."
 
-#: src/commandhandler.cpp:758
+#: src/commandhandler.cpp:577
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/commandhandler.cpp:780
+#: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:787
+#: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:789
+#: src/commandhandler.cpp:608
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/commandhandler.cpp:806
+#: src/commandhandler.cpp:625
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/commandhandler.cpp:817
+#: src/commandhandler.cpp:636
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Grupp skapad."
 
-#: src/commandhandler.cpp:819
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/commandhandler.cpp:1112 src/commandhandler.cpp:1158
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:1122
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1131
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1139
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1147
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1155
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -759,12 +367,12 @@ msgstr ""
 msgid "Reset"
 msgstr "Återställ"
 
-#: src/gui/buy.cpp:54 src/gui/buy.cpp:61 src/gui/buy.cpp:95
-#: src/gui/buysell.cpp:63
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Köp"
 
-#: src/gui/buy.cpp:86 src/gui/buy.cpp:300 src/gui/sell.cpp:85
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
 #: src/gui/sell.cpp:320
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -772,50 +380,52 @@ msgstr "Pris: %s / Totalt: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:91 src/gui/itemamount.cpp:205 src/gui/itemamount.cpp:233
-#: src/gui/npcdialog.cpp:111 src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:94 src/gui/itemamount.cpp:204 src/gui/itemamount.cpp:232
-#: src/gui/npcdialog.cpp:112 src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:96 src/gui/quitdialog.cpp:47 src/gui/quitdialog.cpp:52
-#: src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91 src/gui/serverdialog.cpp:253
-#: src/keyboardconfig.cpp:277
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/gui/buy.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
 #: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
 #: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Max"
 
-#: src/gui/buysell.cpp:38 src/gui/buysell.cpp:47
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
 #: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Affär"
 
-#: src/gui/buysell.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
 #: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Sälj"
 
-#: src/gui/buysell.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:80
-#: src/gui/connectiondialog.cpp:45 src/gui/itemamount.cpp:207
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
 #: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
 #: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
 #: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
 #: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
 #: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
 #: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:154
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -971,7 +581,7 @@ msgstr "Avregistrera"
 msgid "Change Email"
 msgstr "Ändra epostadress"
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:257
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
@@ -991,90 +601,90 @@ msgstr "Nivå: %d"
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:93
+#: src/gui/chatwindow.cpp:93
 #, fuzzy
 msgid "default"
 msgstr "Förval"
 
-#: src/gui/chat.cpp:94
+#: src/gui/chatwindow.cpp:94
 msgid "black"
 msgstr ""
 
-#: src/gui/chat.cpp:95
+#: src/gui/chatwindow.cpp:95
 #, fuzzy
 msgid "red"
 msgstr "Vän"
 
-#: src/gui/chat.cpp:96
+#: src/gui/chatwindow.cpp:96
 #, fuzzy
 msgid "green"
 msgstr "Grön: "
 
-#: src/gui/chat.cpp:97
+#: src/gui/chatwindow.cpp:97
 #, fuzzy
 msgid "blue"
 msgstr "Blå: "
 
-#: src/gui/chat.cpp:98
+#: src/gui/chatwindow.cpp:98
 msgid "gold"
 msgstr ""
 
-#: src/gui/chat.cpp:99
+#: src/gui/chatwindow.cpp:99
 #, fuzzy
 msgid "yellow"
 msgstr "låg"
 
-#: src/gui/chat.cpp:100
+#: src/gui/chatwindow.cpp:100
 #, fuzzy
 msgid "pink"
 msgstr "Länk"
 
-#: src/gui/chat.cpp:101
+#: src/gui/chatwindow.cpp:101
 msgid "purple"
 msgstr ""
 
-#: src/gui/chat.cpp:102
+#: src/gui/chatwindow.cpp:102
 msgid "grey"
 msgstr ""
 
-#: src/gui/chat.cpp:103
+#: src/gui/chatwindow.cpp:103
 #, fuzzy
 msgid "brown"
 msgstr "Kastvapen"
 
-#: src/gui/chat.cpp:104
+#: src/gui/chatwindow.cpp:104
 #, fuzzy
 msgid "rainbow 1"
 msgstr "Regnbåge"
 
-#: src/gui/chat.cpp:105
+#: src/gui/chatwindow.cpp:105
 #, fuzzy
 msgid "rainbow 2"
 msgstr "Regnbåge"
 
-#: src/gui/chat.cpp:106
+#: src/gui/chatwindow.cpp:106
 #, fuzzy
 msgid "rainbow 3"
 msgstr "Regnbåge"
 
-#: src/gui/chat.cpp:123 src/gui/itemamount.cpp:91 src/gui/login.cpp:76
-#: src/gui/setup_players.cpp:216 src/gui/setup_theme.cpp:68
-#: src/gui/setup_video.cpp:164 src/gui/setup_video.cpp:189
-#: src/gui/textcommandeditor.cpp:98 src/gui/textcommandeditor.cpp:137
-#: src/gui/textcommandeditor.cpp:156
+#: src/gui/chatwindow.cpp:123 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
 msgid "???"
 msgstr "???"
 
-#: src/gui/chat.cpp:133 src/gui/setup_chat.cpp:61
+#: src/gui/chatwindow.cpp:133 src/gui/setup_chat.cpp:61
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/gui/chat.cpp:560
+#: src/gui/chatwindow.cpp:561
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d spelare är närvarande."
 
-#: src/gui/chat.cpp:939
+#: src/gui/chatwindow.cpp:940
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -1209,7 +819,7 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/editdialog.cpp:44 src/gui/itemamount.cpp:206
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
 #: src/gui/trade.cpp:82 src/gui/trade.cpp:84
 msgid "OK"
@@ -1226,11 +836,11 @@ msgstr "Utrustning"
 msgid "Unequip"
 msgstr "Avrusta"
 
-#: src/gui/help.cpp:39
+#: src/gui/helpwindow.cpp:39
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/gui/help.cpp:53 src/gui/inventorywindow.cpp:172
+#: src/gui/helpwindow.cpp:53 src/gui/inventorywindow.cpp:172
 #: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Stäng"
@@ -1317,39 +927,39 @@ msgstr "Hämta"
 msgid "Drop"
 msgstr "Släpp"
 
-#: src/gui/itemamount.cpp:208
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alla"
 
-#: src/gui/itemamount.cpp:259
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
-#: src/gui/itemamount.cpp:262
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
-#: src/gui/itemamount.cpp:265
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Välj antal att lagra."
 
-#: src/gui/itemamount.cpp:268
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal att hämta."
 
-#: src/gui/itemamount.cpp:271
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Välj antal föremål att dela."
 
-#: src/gui/itemamount.cpp:274
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:277
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:280
+#: src/gui/itemamountwindow.cpp:280
 #, fuzzy
 msgid "Unknown."
 msgstr "Okänt fel"
@@ -1496,7 +1106,7 @@ msgstr "Stäng"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:119
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Användarnamn"
 
@@ -1518,11 +1128,11 @@ msgstr "Kom ihåg användarnamnet"
 msgid "Update:"
 msgstr ""
 
-#: src/gui/login.cpp:117 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Registrera"
 
-#: src/gui/login.cpp:118
+#: src/gui/login.cpp:119
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
@@ -2020,56 +1630,56 @@ msgstr "Välj din server"
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:229
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:246
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:232
-msgid "Use same ip for game sub servers"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:254
+#: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:255
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Connect"
 msgstr "Ansluter..."
 
-#: src/gui/serverdialog.cpp:256
+#: src/gui/serverdialog.cpp:263
 #, fuzzy
 msgid "Custom Server"
 msgstr "Särskild muspekare"
 
-#: src/gui/serverdialog.cpp:361
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Var vänlig skriv både adressen och porten till en server."
 
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:499
+#: src/gui/serverdialog.cpp:518
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Väntar på server"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:526
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:604
+#: src/gui/serverdialog.cpp:624
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:606
+#: src/gui/serverdialog.cpp:626
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3589,34 +3199,34 @@ msgstr "Du har inte tillräckligt med pengar."
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: src/gui/updatewindow.cpp:133
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: src/gui/updatewindow.cpp:152
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
 msgstr "Spela"
 
-#: src/gui/updatewindow.cpp:535
+#: src/gui/updatewindow.cpp:545
 msgid "##1  The update process is incomplete."
 msgstr "##1  Uppdateringsprocessen är inte avslutad."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:537
+#: src/gui/updatewindow.cpp:547
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det rekommenderar verkligen att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:539
+#: src/gui/updatewindow.cpp:549
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1  du försöker igen senare"
 
-#: src/gui/updatewindow.cpp:665
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Färdig"
 
@@ -3863,6 +3473,12 @@ msgstr "Kommando: /op <spelare>"
 msgid "This command makes <nick> a channel operator."
 msgstr "Det här kommandot gör <spelare> till chattkanalsoperatör."
 
+#: src/gui/widgets/channeltab.cpp:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+"Om <spelare> innehåller mellanslag, måste du sätta citattecken (\") runt det."
+
 #: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
@@ -3929,6 +3545,11 @@ msgstr "Kommando: /item"
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
+#: src/gui/widgets/whispertab.cpp:128
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Kommando: /item <alternativ>"
+
 #: src/gui/widgets/whispertab.cpp:129
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
@@ -4481,7 +4102,7 @@ msgstr[1] "Du plockade upp %s [@@%d|%s@@]."
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3742
+#: src/localplayer.cpp:3752
 #, fuzzy
 msgid "You see "
 msgstr "Du får %s."
@@ -5116,20 +4737,20 @@ msgstr "Kunde inte viska eftersom spelaren inte är inloggad."
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/net/tmwa/chathandler.cpp:334
+#: src/net/tmwa/chathandler.cpp:336
 #, fuzzy
 msgid "MVP player."
 msgstr "Spelare"
 
-#: src/net/tmwa/chathandler.cpp:338
+#: src/net/tmwa/chathandler.cpp:340
 #, fuzzy
 msgid "MVP player: "
 msgstr "Spelare"
 
-#: src/net/tmwa/chathandler.cpp:391 src/net/tmwa/chathandler.cpp:397
-#: src/net/tmwa/chathandler.cpp:402 src/net/tmwa/chathandler.cpp:408
-#: src/net/tmwa/chathandler.cpp:413 src/net/tmwa/chathandler.cpp:419
-#: src/net/tmwa/chathandler.cpp:426 src/net/tmwa/chathandler.cpp:432
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Chattkanaler stöds inte!"
 
@@ -5423,6 +5044,10 @@ msgstr "/item > Visa/ändra delningsalternativ för upplock inom gruppen"
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Visa/ändra hur erfarenhet fördelas i gruppen"
 
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Det här kommandot bjuder in <spelare> till din grupp."
+
 #: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
 msgstr "Det här kommandot får spelaren att lämna gruppen."
@@ -5909,6 +5534,251 @@ msgstr "Mana %+d"
 msgid "Unknown item"
 msgstr "Okänt föremål"
 
+#~ msgid "-- Help --"
+#~ msgstr "-- Hjälp --"
+
+#~ msgid "/help > Display this help"
+#~ msgstr "/help > Visa den här hjälpen"
+
+#~ msgid "/where > Display map name"
+#~ msgstr "/where > Visa kartans namn"
+
+#~ msgid "/who > Display number of online users"
+#~ msgstr "/who > Visa antalet inloggade spelare"
+
+#~ msgid "/me > Tell something about yourself"
+#~ msgstr "/me > Säg något om dig själv"
+
+#~ msgid "/clear > Clears this window"
+#~ msgstr "/clear > Tömmer det här fönstret"
+
+#~ msgid "/msg > Send a private message to a user"
+#~ msgstr "/msg > Skickar ett privat meddelande till en spelare"
+
+#~ msgid "/whisper > Alias of msg"
+#~ msgstr "/whisper > Alias för msg"
+
+#~ msgid "/w > Alias of msg"
+#~ msgstr "/w > Alias för msg"
+
+#~ msgid "/query > Makes a tab for private messages with another user"
+#~ msgstr ""
+#~ "/query > Skapar en flik för privata meddelanden med en annan spelare"
+
+#~ msgid "/q > Alias of query"
+#~ msgstr "/q > Alias för query"
+
+#, fuzzy
+#~ msgid "/ignoreall > Ignore all opened whisper tabs"
+#~ msgstr "/close > Stänger viskningsfliken"
+
+#, fuzzy
+#~ msgid "/disregard > Disregard a player"
+#~ msgstr "@@disregard|Strunta i %s@@"
+
+#~ msgid "/list > Display all public channels"
+#~ msgstr "/list > Visa alla offentliga chattkanaler"
+
+#~ msgid "/join > Join or create a channel"
+#~ msgstr "/join > Gå med i eller skapa en chattkanal"
+
+#, fuzzy
+#~ msgid "/createparty > Create a new party"
+#~ msgstr "/create > Skapa ny grupp"
+
+#, fuzzy
+#~ msgid "/createguild > Create a new guild"
+#~ msgstr "/create > Skapa ny grupp"
+
+#~ msgid "/party > Invite a user to party"
+#~ msgstr "/party > Bjud in en spelare till din grupp"
+
+#~ msgid "/toggle > Determine whether <return> toggles the chat log"
+#~ msgstr "/toggle > Avgör huruvida <retur> aktiverar chattfönstret eller ej"
+
+#~ msgid ""
+#~ "/present > Get list of players present (sent to chat log, if logging)"
+#~ msgstr ""
+#~ "/present > Lista närvarande spelare (sänds till chattloggen om loggning "
+#~ "är aktiverad)"
+
+#~ msgid "/announce > Global announcement (GM only)"
+#~ msgstr "/announce > Globalt meddelande (endast för GM)"
+
+#, fuzzy
+#~ msgid "/closeall > Close all opened whisper tabs"
+#~ msgstr "/close > Stänger viskningsfliken"
+
+#, fuzzy
+#~ msgid "/mail > Send offline message to player"
+#~ msgstr "/msg > Skickar ett privat meddelande till en spelare"
+
+#~ msgid "For more information, type /help <command>."
+#~ msgstr "Skriv /help <kommando> för mer information."
+
+#~ msgid "Command: /help"
+#~ msgstr "Kommando: /help"
+
+#~ msgid "This command displays a list of all commands available."
+#~ msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon."
+
+#~ msgid "Command: /help <command>"
+#~ msgstr "Kommando: /help <kommando>"
+
+#~ msgid "This command displays help on <command>."
+#~ msgstr "Det här kommandot ger mer information om <kommando>."
+
+#~ msgid "Command: /announce <msg>"
+#~ msgstr "Kommando: /announce <text>"
+
+#~ msgid "*** only available to a GM ***"
+#~ msgstr "*** endast en GM kan använda det här kommandot ***"
+
+#~ msgid ""
+#~ "This command sends the message <msg> to all players currently online."
+#~ msgstr ""
+#~ "Det här kommandot skickar meddelandet <text> till alla inloggade spelare."
+
+#~ msgid "Command: /clear"
+#~ msgstr "Kommando: /clear"
+
+#~ msgid "This command clears the chat log of previous chat."
+#~ msgstr "Det här kommandot tömmer chattloggen."
+
+#, fuzzy
+#~ msgid "Command: /ignore <player>"
+#~ msgstr "Kommando: /item <alternativ>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command ignores the given player regardless of current relations."
+#~ msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
+
+#~ msgid "Command: /join <channel>"
+#~ msgstr "Kommando: /join <chattkanal>"
+
+#~ msgid "This command makes you enter <channel>."
+#~ msgstr "Det här kommandot låter dig gå in i <chattkanal>."
+
+#~ msgid "If <channel> doesn't exist, it's created."
+#~ msgstr "Om <chattkanal> inte existerar, skapas den."
+
+#~ msgid "Command: /list"
+#~ msgstr "Kommando: /list"
+
+#~ msgid "This command shows a list of all channels."
+#~ msgstr "Det här kommandot visar en lista över alla chattkanaler."
+
+#~ msgid "Command: /me <message>"
+#~ msgstr "Kommando: /me <meddelande>"
+
+#~ msgid "This command tell others you are (doing) <msg>."
+#~ msgstr "Det här kommandet berättar för andra att du är/gör <meddelande>."
+
+#~ msgid "Command: /msg <nick> <message>"
+#~ msgstr "Kommando: /msg <spelare> <meddelande>"
+
+#~ msgid "Command: /whisper <nick> <message>"
+#~ msgstr "Kommando: /whisper <spelare> <meddelande>"
+
+#~ msgid "Command: /w <nick> <message>"
+#~ msgstr "Kommando: /w <spelare> <meddelande>"
+
+#~ msgid "This command sends the text <message> to <nick>."
+#~ msgstr "Det här kommandot skickar <meddelande> till <spelare>."
+
+#~ msgid "Command: /query <nick>"
+#~ msgstr "Kommando: /query <spelare>"
+
+#~ msgid "Command: /q <nick>"
+#~ msgstr "Kommando: /q <spelare>"
+
+#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#~ msgstr ""
+#~ "Det här kommandot försöker att skapa en flik för viskningar mellan dig "
+#~ "och <spelare>."
+
+#, fuzzy
+#~ msgid "Command: /away <afk reason>"
+#~ msgstr "Kommando: /w <spelare> <meddelande>"
+
+#, fuzzy
+#~ msgid "Command: /away"
+#~ msgstr "Kommando: /who"
+
+#, fuzzy
+#~ msgid "This command clears the away status and message."
+#~ msgstr "Det här kommandot sätter ämnet till <meddelande>."
+
+#, fuzzy
+#~ msgid "Command: /createparty <name>"
+#~ msgstr "Kommando: /create <grupp>"
+
+#, fuzzy
+#~ msgid "This command creates a new party called <name>."
+#~ msgstr "Dessa kommandon skapar <grupp>."
+
+#, fuzzy
+#~ msgid "Command: /createguild <name>"
+#~ msgstr "Kommando: /create <grupp>"
+
+#, fuzzy
+#~ msgid "This command creates a new guild called <name>."
+#~ msgstr "Dessa kommandon skapar <grupp>."
+
+#~ msgid "Command: /party <nick>"
+#~ msgstr "Kommando: /party <spelare>"
+
+#~ msgid "Command: /present"
+#~ msgstr "Kommando: /present"
+
+#, fuzzy
+#~ msgid ""
+#~ "This command gets a list of players within hearing and sends it to chat "
+#~ "log."
+#~ msgstr ""
+#~ "Det här kommandot ger en lista över spelare som finns inom höravstånd, om "
+#~ "loggning av chatten är aktiverad skickas listan till loggfilen."
+
+#~ msgid "Command: /toggle <state>"
+#~ msgstr "Kommando: /toggle <tillstånd>"
+
+#~ msgid ""
+#~ "This command sets whether the return key should toggle the chat log, or "
+#~ "whether the chat log turns off automatically."
+#~ msgstr ""
+#~ "Det här kommandot anger huruvida retur visar/döljerer chattfönstret eller "
+#~ "om chattfönstret stänger sig själv."
+
+#~ msgid ""
+#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
+#~ "\"0\", \"no\", \"false\" to turn the toggle off."
+#~ msgstr ""
+#~ "<tillstånd> kan vara ”1”, ”yes” eller ”true” för att använda "
+#~ "returtangenten eller ”0”, ”no” eller ”false” för att använda automatisk "
+#~ "stängning."
+
+#~ msgid "Command: /toggle"
+#~ msgstr "Kommando: /toggle"
+
+#~ msgid "This command displays the return toggle status."
+#~ msgstr "Det här kommandot visar tillståndet för huruvida retur används."
+
+#~ msgid "Command: /where"
+#~ msgstr "Kommando: /where"
+
+#~ msgid "This command displays the name of the current map."
+#~ msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
+
+#~ msgid "Command: /who"
+#~ msgstr "Kommando: /who"
+
+#~ msgid "This command displays the number of players currently online."
+#~ msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
+
+#~ msgid "Type /help for a list of commands."
+#~ msgstr "Skriv /help för en lista med kommandon."
+
 #, fuzzy
 #~ msgid "Particle detail: %s"
 #~ msgstr "Partikeldetaljer"