Update translations. Add cs translation by Pitriss.

author: Andrei Karas <akaras@inbox.ru> 2011-09-17 16:48:09 +0300
committer: Andrei Karas <akaras@inbox.ru> 2011-09-17 16:48:09 +0300
commit: d9926d7bb1436d0d624e8abbad2c9166b26e3a25 (patch)
tree: fe518ac75e095bd82c052b502e227f656775c894 /po
parent: 73d6e00a4639680786e4f31ae29aeeaebba9a8ae (diff)
download: manaverse-d9926d7bb1436d0d624e8abbad2c9166b26e3a25.tar.gz
manaverse-d9926d7bb1436d0d624e8abbad2c9166b26e3a25.tar.bz2
manaverse-d9926d7bb1436d0d624e8abbad2c9166b26e3a25.tar.xz
manaverse-d9926d7bb1436d0d624e8abbad2c9166b26e3a25.zip
17 files changed, 6860 insertions, 6677 deletions
diff --git a/po/LINGUAS b/po/LINGUAS
index 66da28559..44b6e67b7 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -2,7 +2,7 @@
 #ar # Disabled because of current client limitations (shaping, RTL)
 #bg # Not enough translations
 #ca # Not enough translations
-#cs # Not enough translations
+cs
 #da # Not enough translations
 de
 #en_GB # Not enough translations
diff --git a/po/cs.po b/po/cs.po
index afda4a26c..f0ac1b589 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,236 +1,254 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
+# Pitriss <chytrex@wjake.com>, 2011.
+# Pitriss V <chytrex_fsude@centrum.cz>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-17 13:43+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
+"cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
-msgstr ""
+msgstr "Viditelný na mapě"
 
-#: src/being.cpp:542
+#: src/being.cpp:548
 msgid "dodge"
-msgstr ""
+msgstr "úskočil"
 
-#: src/being.cpp:542
+#: src/being.cpp:548
 msgid "miss"
-msgstr ""
+msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1527
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1532
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:908
-msgid "Connecting to server"
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Výkon"
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Video"
+
+#: src/client.cpp:851
+msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:932
+msgid "Connecting to server"
+msgstr "Připojuji se k serveru"
+
+#: src/client.cpp:963
 msgid "Logging in"
-msgstr ""
+msgstr "Přihlašuji se"
 
-#: src/client.cpp:972
+#: src/client.cpp:996
 msgid "Entering game world"
-msgstr ""
+msgstr "Vstupuji do herního světa"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1096
 msgid "Requesting characters"
-msgstr ""
+msgstr "Požaduji postavy"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
-msgstr ""
+msgstr "Připojuji se k hernímu serveru"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1137
 msgid "Changing game servers"
-msgstr ""
+msgstr "Zaměňuji herní servery"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
 #: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1196
 msgid "Requesting registration details"
-msgstr ""
+msgstr "Požaduji registrační detaily"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1222
 msgid "Password Change"
-msgstr ""
+msgstr "Změna hesla"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
-msgstr ""
+msgstr "Heslo úspěšně změněno!"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1242
 msgid "Email Change"
-msgstr ""
+msgstr "Změna emailu"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
-msgstr ""
+msgstr "Email úspěšně změněn!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1263
 msgid "Unregister Successful"
-msgstr ""
+msgstr "Zrušení registrace úspěšné"
 
-#: src/client.cpp:1235
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
-msgstr ""
+msgstr "Nashledanou, vraťte se kdykoli..."
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
-msgstr ""
+msgstr "Neplatný host updatů: %s"
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
-msgstr ""
+msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1700
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Neznámý příkaz."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
-msgstr ""
+msgstr "Nelze zaslat prázdné šeptání!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:309
 #, 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 ""
+"Nelze vytvořit záložku se šeptáním pro \"%s\"! Buďto záložka existuje nebo "
+"jsi to ty."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
-msgstr ""
+msgstr "Chybí jméno party."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
-msgstr ""
+msgstr "Chybí jméno guildy."
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
-msgstr ""
+msgstr "Prosím zadej jméno."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
-msgstr ""
+msgstr "Enter přepíná chat."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
-msgstr ""
+msgstr "Zpráva zavírá chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
-msgstr ""
+msgstr "Enter nyní přepíná chat."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
-msgstr ""
+msgstr "Zpráva nyní ukončuje chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:460
 msgid "friend"
-msgstr ""
+msgstr "přítel"
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:465
 msgid "disregarded"
-msgstr ""
+msgstr "přehlížený"
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:470
 msgid "neutral"
-msgstr ""
+msgstr "neutrální"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
-msgstr ""
+msgstr "Hráč je již %s!"
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
-msgstr ""
+msgstr "Hráč byl úspěšně zařazen jako %s!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
-msgstr ""
+msgstr "Hráč nemůže být zařazen jako %s!"
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
-msgstr ""
+msgstr "Hráč nebyl ignorován!"
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
-msgstr ""
+msgstr "Hráč již není ignorován!"
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
-msgstr ""
+msgstr "Hráč nemůže být odignorován!"
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
-msgstr ""
+msgstr "Hráč již byl vymazán!"
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
-msgstr ""
+msgstr "Hráč byl úspěšně vymazán!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
-msgstr ""
+msgstr "Hráč nemůže být vymazán!"
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
-msgstr ""
+msgstr "Doba běhu klienta: %s"
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -238,7 +256,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -246,7 +264,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -254,7 +272,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -262,7 +280,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -270,27 +288,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:994
 msgid "font cache size"
-msgstr ""
+msgstr "velikost chache fontů"
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
-msgstr ""
+msgstr "Velikost cache:"
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1010
 msgid "Created:"
-msgstr ""
+msgstr "Vytvořeno:"
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
-msgstr ""
+msgstr "Odstraněno:"
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -299,168 +317,169 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:513
 msgid "Screenshot saved as "
-msgstr ""
+msgstr "Snímky obrazovky ukládat jako "
 
-#: src/game.cpp:483
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
-#: src/game.cpp:523
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
-msgstr ""
+msgstr "Spojení se serverem bylo ztraceno."
 
-#: src/game.cpp:537
+#: src/game.cpp:571
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
-msgstr ""
+msgstr "Nelze načíst mapu"
 
-#: src/game.cpp:1577
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
-msgstr ""
+msgstr "Parta: %s"
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
-msgstr ""
+msgstr "Guilda: %s"
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
-msgstr ""
+msgstr "Pvp hodnost: %d"
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
-msgstr ""
+msgstr "Komentář: %s"
 
 #: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
-msgstr ""
+msgstr "Ověřovač botů"
 
 #: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Jméno"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Útok"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
-msgstr ""
+msgstr "Mluvit"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
-msgstr ""
+msgstr "Výsledek"
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
 msgid "Reset"
-msgstr "Reset"
+msgstr "Vynulovat"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Nákup"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
-msgstr ""
+msgstr "Cena: %s / Celkem %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
 msgid "Max"
 msgstr "Vše"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
 msgid "Shop"
 msgstr "Obchod"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Prodej"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -475,24 +494,24 @@ msgstr "Účet: %s"
 
 #: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr ""
+msgstr "Zadej novou emailovou adresu dvakrát:"
 
 #: src/gui/changeemaildialog.cpp:132
 #, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr ""
+msgstr "Nová emailová adresa musí být nejméně %d znaků dlouhá."
 
 #: src/gui/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr ""
+msgstr "Nová emailová adresa musí být méně než %d znaků dlouhá."
 
 #: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
-msgstr ""
+msgstr "Emailové adresy nesouhlasí."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
 msgid "Change Password"
 msgstr "Změnit heslo"
 
@@ -503,209 +522,210 @@ msgstr "Heslo:"
 
 #: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
-msgstr ""
+msgstr "Zadej nové heslo dvakrát:"
 
 #: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
-msgstr ""
+msgstr "Nejdřív zadej původní heslo."
 
 #: src/gui/changepassworddialog.cpp:120
 #, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr ""
+msgstr "Nové heslo musí být nejméně %d znaků dlouhé."
 
 #: src/gui/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr ""
+msgstr "Nové heslo musí být méně než.%d znaků dlouhé."
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
-msgstr ""
+msgstr "Nová hesla nesouhlasí."
 
 #: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Jméno:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair color:"
-msgstr ""
+msgstr "Barva vlasů:"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
 msgid "Hair style:"
-msgstr ""
+msgstr "Účes:"
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
 msgid "Race:"
-msgstr ""
+msgstr "Rasa:"
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
+#: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Vytvořit"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
 msgid "Character stats OK"
-msgstr ""
+msgstr "Stav postavy je OK"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
 #, c-format
 msgid "Please remove %d points"
-msgstr "Odstraňte prosím %d bodů."
+msgstr "Odstraňte prosím %d bodů"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "Potvrďte smazání postavy"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete smazat tuto postavu?"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "Správa účtu a postavy"
 
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
 msgid "Switch Login"
-msgstr ""
+msgstr "Přepnout přihlášení"
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Zrušit registraci"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
 msgid "Change Email"
-msgstr ""
+msgstr "Změnit email"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
 msgid "Incorrect password"
-msgstr ""
+msgstr "Špatné heslo"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
 msgid "Enter password for deleting character"
-msgstr ""
+msgstr "Zadej heslo pro smazání postavy"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
 msgid "Enter password:"
-msgstr ""
+msgstr "Zadej heslo:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:468
 msgid "Choose"
-msgstr ""
+msgstr "Vybrat"
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:471
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
 msgid "default"
-msgstr ""
+msgstr "výchozí"
 
 #: src/gui/chatwindow.cpp:113
 msgid "black"
-msgstr ""
+msgstr "černá"
 
 #: src/gui/chatwindow.cpp:114
 msgid "red"
-msgstr ""
+msgstr "červená"
 
 #: src/gui/chatwindow.cpp:115
 msgid "green"
-msgstr ""
+msgstr "zelená"
 
 #: src/gui/chatwindow.cpp:116
 msgid "blue"
-msgstr ""
+msgstr "modrá"
 
 #: src/gui/chatwindow.cpp:117
 msgid "gold"
-msgstr ""
+msgstr "zlatá"
 
 #: src/gui/chatwindow.cpp:118
 msgid "yellow"
-msgstr ""
+msgstr "žlutá"
 
 #: src/gui/chatwindow.cpp:119
 msgid "pink"
-msgstr ""
+msgstr "růžová"
 
 #: src/gui/chatwindow.cpp:120
 msgid "purple"
-msgstr ""
+msgstr "fialová"
 
 #: src/gui/chatwindow.cpp:121
 msgid "grey"
-msgstr ""
+msgstr "šedá"
 
 #: src/gui/chatwindow.cpp:122
 msgid "brown"
-msgstr ""
+msgstr "hnědá"
 
 #: src/gui/chatwindow.cpp:123
 msgid "rainbow 1"
-msgstr ""
+msgstr "duhová 1"
 
 #: src/gui/chatwindow.cpp:124
 msgid "rainbow 2"
-msgstr ""
+msgstr "duhová 2"
 
 #: src/gui/chatwindow.cpp:125
 msgid "rainbow 3"
-msgstr ""
-
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+msgstr "duhová 3"
+
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -713,15 +733,15 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:609
 #, c-format
 msgid "Present: %s; %d players are present."
-msgstr ""
+msgstr "Přítomno: %s; %d hráčů je přítomno."
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:996
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr ""
+msgstr "Šeptání pro %s: %s"
 
 #: src/gui/confirmdialog.cpp:47
 msgid "Yes"
@@ -732,183 +752,183 @@ msgid "No"
 msgstr "Ne"
 
 #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
-msgstr ""
+msgstr "Ignorovat"
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mapa"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
-msgstr ""
+msgstr "Cíl"
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
-msgstr ""
+msgstr "Síť"
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
-msgstr ""
+msgstr "Hudba:"
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
-msgstr ""
+msgstr "Mapa:"
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
-msgstr ""
+msgstr "Minimapa:"
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
-msgstr ""
+msgstr "Kurzor:"
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
-msgstr ""
+msgstr "Pozice hráče:"
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
-msgstr ""
+msgstr "Počet částic:"
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
-msgstr ""
+msgstr "Počet textur:"
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
-msgstr ""
+msgstr "poet částic: %d"
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
 msgid "Target:"
-msgstr ""
+msgstr "Cíl:"
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
 msgid "Target Id:"
-msgstr ""
+msgstr "Id cíle:"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
 msgid "Target Level:"
-msgstr ""
+msgstr "Úroveň cíle:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
 msgid "Target Party:"
-msgstr ""
+msgstr "Parta cíle:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
 msgid "Target Guild:"
-msgstr ""
+msgstr "Gilda cíle:"
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
 msgid "Attack delay:"
-msgstr ""
+msgstr "Prodleva útoku:"
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
 msgid "Minimal hit:"
-msgstr ""
+msgstr "Minimální zásah:"
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
 msgid "Maximum hit:"
-msgstr ""
+msgstr "Maximální zásah:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
 msgid "Critical hit:"
-msgstr ""
+msgstr "Kritický zásah:"
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
 #, c-format
 msgid "Ping: %s ms"
-msgstr ""
+msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
 #, c-format
 msgid "In: %d bytes/s"
-msgstr ""
+msgstr "Příchozí: %d bytes/s"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Out: %d bytes/s"
-msgstr ""
+msgstr "Odchozí: %d bytes/s"
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "Víte že ... ?"
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
-msgstr ""
+msgstr "Zavřít"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
 msgid "< Previous"
-msgstr ""
+msgstr "< Předchozí"
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
 msgid "Next >"
-msgstr ""
+msgstr "Další >"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Auto open this window"
-msgstr ""
+msgstr "Automaticky otevírat toto okno"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Odstranit z vybavení"
 
@@ -916,80 +936,88 @@ msgstr "Odstranit z vybavení"
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr "dle jména"
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr "dle id"
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr "dle váhy"
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr "dle množství"
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr "dle typu"
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventář"
 
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:136
 msgid "Slots:"
 msgstr "Sloty:"
 
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:148
 msgid "Filter:"
-msgstr ""
+msgstr "Filtr:"
 
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:149
 msgid "Sort:"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
-msgstr ""
+msgstr "Třídit:"
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Použít"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
-msgstr ""
+msgstr "Upustit..."
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Rozdělit"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
-msgstr ""
+msgstr "Výstroje"
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "Hmotnost:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
-msgstr ""
+msgstr "Uložit"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
-msgstr ""
+msgstr "Vzít"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Upustit"
@@ -1008,86 +1036,86 @@ msgstr "Vyberte množství předmětů, které chcete upustit."
 
 #: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
-msgstr ""
+msgstr "Vyberte množství předmětů, které chcete uskladnit."
 
 #: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
-msgstr ""
+msgstr "Vyberte množství předmětů, které chcete obdržet."
 
 #: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
-msgstr ""
+msgstr "Vyberte množství předmětů, které chcete rozdělit."
 
 #: src/gui/itemamountwindow.cpp:276
 msgid "Add to buy shop."
-msgstr ""
+msgstr "Přidat k nákupu."
 
 #: src/gui/itemamountwindow.cpp:279
 msgid "Add to sell shop."
-msgstr ""
+msgstr "Přidat k prodeji."
 
 #: src/gui/itemamountwindow.cpp:282
 msgid "Unknown."
-msgstr ""
+msgstr "Neznámý."
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
-msgstr ""
+msgstr "Váha: %s"
 
 #: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
-msgstr ""
+msgstr "Statistiky zabíjení"
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
-msgstr ""
+msgstr "Resetovat statistiky"
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
-msgstr ""
+msgstr "Reset časomíry"
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
-msgstr ""
+msgstr "Úroveň: %d při %f%%"
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
-msgstr ""
+msgstr "Exp: %d/%d Zbývá: %d"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr ""
+msgstr "1%% = %d exp, prům. mobů na 1%%: %s"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr ""
+msgstr "Zabitých: %s, celkem exp %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Prům exp: %s, Počet prům mobů na další úroveň: %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr ""
+msgstr "Zabitých/Min: %s, Exp/Min: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1095,7 +1123,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1103,31 +1131,35 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
-msgstr ""
+msgstr "Exp za poslední zabití:"
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
-msgstr ""
+msgstr "Čas do zrození Jack O:"
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
-msgstr ""
+msgstr "Čas do další úrovně: %s"
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
-msgstr ""
+msgstr "Jack O se rodí"
+
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Opustil jsi gildu."
 
 #: src/gui/logindialog.cpp:59
 msgid "Normal"
@@ -1135,32 +1167,32 @@ msgstr ""
 
 #: src/gui/logindialog.cpp:60
 msgid "Auto Close"
-msgstr ""
+msgstr "Automaticky zavírat"
 
 #: src/gui/logindialog.cpp:61
 msgid "Skip"
-msgstr ""
+msgstr "Přeskočit"
 
 #: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Přihlášení"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
 #: src/gui/logindialog.cpp:96
 msgid "Custom update host"
-msgstr ""
+msgstr "Vlastní host updatů"
 
 #: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr ""
+msgstr "Pamatovat přihlášení"
 
 #: src/gui/logindialog.cpp:111
 msgid "Update:"
-msgstr ""
+msgstr "Updaty:"
 
 #: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
@@ -1168,47 +1200,47 @@ msgstr "Registrace"
 
 #: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr ""
+msgstr "Změnit server"
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
-msgstr ""
+msgstr "pruh zdraví"
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
-msgstr ""
+msgstr "pruh many"
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
-msgstr ""
+msgstr "pruh zkušeností"
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
-msgstr ""
+msgstr "pruh práce"
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
-msgstr ""
+msgstr "pruh váhy"
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
-msgstr ""
+msgstr "pruh slotů inventáře"
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
-msgstr ""
+msgstr "pruh peněz"
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
-msgstr ""
+msgstr "pruh šípů"
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
-msgstr ""
+msgstr "stavový řádek"
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
-msgstr ""
+msgstr "Potřebuješ"
 
 #: src/gui/npcdialog.cpp:51
 msgid "Waiting for server"
@@ -1220,24 +1252,24 @@ msgstr "Další"
 
 #: src/gui/npcdialog.cpp:54
 msgid "Submit"
-msgstr ""
+msgstr "Odeslat"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
-msgstr ""
+msgstr "Vyprázdnit"
 
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
 msgid "> Next"
-msgstr ""
+msgstr "> Další"
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
-msgstr ""
+msgstr "Komu:"
 
 #: src/gui/npcpostdialog.cpp:55
 msgid "Send"
@@ -1245,349 +1277,351 @@ msgstr "Odeslat"
 
 #: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
-msgstr ""
+msgstr "Odeslání se nezdařilo. odesílatel nebo dopis není platný."
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
 #, c-format
 msgid "Outfit: %d"
-msgstr ""
+msgstr "Výstroj: %d"
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
 #, c-format
 msgid "Key: %s"
-msgstr ""
+msgstr "Klávesa: %s"
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
-msgstr ""
+msgstr "Nejdřív odstrojit"
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
-msgstr ""
+msgstr "Výstroj pro \"Away\""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Obchod"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
-msgstr ""
+msgstr "Šeptat"
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
-msgstr ""
+msgstr "Vyléčit"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
-msgstr ""
+msgstr "Být přátelé"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+msgstr "Přehlížet"
+
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
-msgstr ""
+msgstr "Vymazat"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
-msgstr ""
+msgstr "Odignorovat"
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
-msgstr ""
+msgstr "Kompletně ignorovat"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
-msgstr ""
+msgstr "Následovat"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
-msgstr ""
+msgstr "imitovat"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
-msgstr ""
+msgstr "Pozvat do party"
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
-msgstr ""
+msgstr "Vykopnout z party"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
-msgstr ""
+msgstr "Vykopnout z gildy"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
-msgstr ""
+msgstr "Změnit pozici v gildě"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
-msgstr ""
+msgstr "Pozvat do gildy"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
-msgstr ""
+msgstr "Vykopnout hráče"
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
-msgstr ""
+msgstr "Zobrazit věci"
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
-msgstr ""
+msgstr "Svléct"
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
-msgstr ""
+msgstr "Přidat komentář"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
-msgstr ""
+msgstr "Koupit (?)"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
-msgstr ""
+msgstr "Prodat (?)"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
-msgstr ""
+msgstr "Vykopnout"
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
-msgstr ""
+msgstr "Vložit do seznamu ignorovaných"
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
-msgstr ""
+msgstr "Vložit jméno do chatu"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
-msgstr ""
+msgstr "Sebrat"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
-msgstr ""
+msgstr "Vložit do chatu"
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
-msgstr ""
+msgstr "Označit na mapě"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
-msgstr ""
+msgstr "Přejmenovat"
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
+msgstr "Odebrat"
+
+#: src/gui/popupmenu.cpp:507
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
-msgstr ""
+msgstr "Načíst staré výstroje"
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
-msgstr ""
+msgstr "Kouzla"
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
-msgstr ""
+msgstr "Načíst stará kouzla"
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
-msgstr ""
+msgstr "Upravit kouzlo"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
-msgstr ""
+msgstr "vypnout zvýrazǒvání"
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
-msgstr ""
+msgstr "Zapnout zvýrazňování"
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
-msgstr ""
+#: src/gui/popupmenu.cpp:566
+msgid "Don't remove name"
+msgstr "Neodebírat jméno"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
-msgstr ""
+msgstr "Odebrat jméno"
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
-msgstr ""
+msgstr "Zapnout \"away\""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
-msgstr ""
+msgstr "Vypnout \"away\""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
-msgstr ""
+msgstr "Odejít"
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
-msgstr ""
+msgstr "Přejmenovat značku an mapě"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
-msgstr ""
+msgstr "Jméno:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
-msgstr ""
+msgstr "Hráčův komentář"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
-msgstr ""
+msgstr "Komentář:                      "
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
-msgstr ""
+msgstr "Přidat do transakce"
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
-msgstr ""
+msgstr "Přidat 10 do transakce"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
-msgstr ""
+msgstr "Přidat polovinu do transakce"
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
-msgstr ""
+msgstr "Přidat vše do transakce"
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
-msgstr ""
+msgstr "Uschovat 10"
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
-msgstr ""
+msgstr "Uschovat polovinu"
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
-msgstr ""
+msgstr "Uschovat všechny"
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
-msgstr ""
+msgstr "Upustit vše"
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
-msgstr ""
+msgstr "Vzít 10"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
-msgstr ""
+msgstr "Vzít polovinu"
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
-msgstr ""
+msgstr "Vzít všechny"
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
-msgstr ""
+msgstr "Načíst staré zkratky věcí"
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
-msgstr ""
+msgstr "Načíst staré zkratky upuštění"
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
-msgstr ""
+msgstr "Skrýt"
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
-msgstr ""
+msgstr "Zobrazit"
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
-msgstr ""
+msgstr "Resetovat žlutý pruh"
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
-msgstr ""
+msgstr "Zkopírovat do chatu"
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
-msgstr ""
+msgstr "Posunout nahoru"
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
+msgstr "Posunout dolů"
 
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
-msgstr ""
+msgstr "Přepnout server"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
-msgstr "Přepněte postavu"
+msgstr "Přepnout postavu"
 
 #: src/gui/register.cpp:77
 msgid "Confirm:"
@@ -1621,91 +1655,91 @@ msgstr "Heslo musí být kratší než %d znaků."
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:237
 msgid "Choose Your Server"
-msgstr ""
+msgstr "Zvolte server"
 
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:248
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr ""
+msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
 
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:253
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Use same ip for game sub servers"
-msgstr ""
+msgstr "Použít stejnou IP pro herní sub servery"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:271
 msgid "Server type:"
-msgstr ""
+msgstr "Typ serveru:"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:295
 msgid "Load"
-msgstr ""
+msgstr "Načíst"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:296
 msgid "Connect"
-msgstr ""
+msgstr "Připojit"
 
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Custom Server"
-msgstr ""
+msgstr "Vlastní server"
 
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:402
 msgid "Please type both the address and the port of a server."
 msgstr "Prosím zadejte adresu a port serveru."
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:560
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "Stahuji seznam serverů...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:565
 msgid "Waiting for server..."
-msgstr ""
+msgstr "Čekám na odezvu serveru..."
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:569
 msgid "Preparing download"
-msgstr ""
+msgstr "Připravuji stažení"
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:573
 msgid "Error retreiving server list!"
-msgstr ""
+msgstr "Chyba při získávání seznamu serverů!"
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:678
 msgid "requires a newer version"
-msgstr ""
+msgstr "potřebuje novější verzi"
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:680
 #, c-format
 msgid "requires v%s"
-msgstr ""
+msgstr "potřebuje v%s"
 
 #: src/gui/setup_audio.cpp:50
 msgid "Enable Audio"
-msgstr ""
+msgstr "Zapnout audio"
 
 #: src/gui/setup_audio.cpp:51
 msgid "Enable game sfx"
-msgstr ""
+msgstr "Zapnout zvukové efekty hry"
 
 #: src/gui/setup_audio.cpp:52
 msgid "Enable gui sfx"
-msgstr ""
+msgstr "Zapnout zvukové efekty gui"
 
 #: src/gui/setup_audio.cpp:53
 msgid "Enable music"
-msgstr ""
+msgstr "Zapnout hudbu"
 
 #: src/gui/setup_audio.cpp:54
 msgid "Enable mumble voice chat"
-msgstr ""
+msgstr "Povolit mumble hlasový chat"
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
-msgstr ""
+msgstr "Stahovat hudbu"
 
 #: src/gui/setup_audio.cpp:61
 msgid "Audio"
@@ -1721,15 +1755,16 @@ msgstr "Hlasitost hudby"
 
 #: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr ""
+msgstr "Upozornění"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
+"Možná budete muset restartovat váš klient, pokud chcete stáhnout novou hudbu"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
-msgstr ""
+msgstr "Zvukový systém"
 
 #: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
 msgid "Colors"
@@ -1737,113 +1772,121 @@ msgstr "Barvy"
 
 #: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
-msgstr ""
+msgstr "Odstranit barvy z příchozích zpráv"
 
 #: src/gui/setup_chat.cpp:60
 msgid "Show chat colors list"
-msgstr ""
+msgstr "Zobrazit seznam barev"
 
 #: src/gui/setup_chat.cpp:64
 msgid "Commands"
-msgstr ""
+msgstr "Příkazy"
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
+msgstr "Povolit magii a GM příkazy ve všech záložkách"
 
 #: src/gui/setup_chat.cpp:70
 msgid "Limits"
-msgstr ""
+msgstr "Omezení"
 
 #: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
-msgstr ""
+msgstr "Omezit maximum znaků na řádek"
 
 #: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
-msgstr ""
+msgstr "Omezit počet řádků chatu"
 
 #: src/gui/setup_chat.cpp:79
 msgid "Logs"
-msgstr ""
+msgstr "Záznamy"
 
 #: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
-msgstr ""
+msgstr "Zapnout zaznamenávání konverzace"
 
 #: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
-msgstr ""
+msgstr "Zobrazovat historii chatu"
 
 #: src/gui/setup_chat.cpp:88
 msgid "Messages"
-msgstr ""
+msgstr "Zprávy"
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
-msgstr ""
+msgstr "Skrýt obchodní zprávy"
 
 #: src/gui/setup_chat.cpp:94
 msgid "Tabs"
-msgstr ""
+msgstr "Záložky"
 
 #: src/gui/setup_chat.cpp:96
 msgid "Put all whispers in tabs"
-msgstr ""
+msgstr "Všechy šeptání jako záložky"
 
 #: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
-msgstr ""
+msgstr "Zaznamenávat zprávy o magii v debug záložce"
 
 #: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
-msgstr ""
+msgstr "Zobrazovat serverové zprávy v debug záložce"
 
 #: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
-msgstr ""
+msgstr "Zapnout obchodní záložku"
 
 #: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
-msgstr ""
+msgstr "Zapnout bitevní záložku"
 
 #: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
-msgstr ""
+msgstr "Zobrazovat bitevní události"
 
 #: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
-msgstr ""
+msgstr "Změnit velikost záložek pokud nutno"
 
 #: src/gui/setup_chat.cpp:118
 msgid "Time"
-msgstr ""
+msgstr "Čas"
 
 #: src/gui/setup_chat.cpp:120
 msgid "Use local time"
-msgstr ""
+msgstr "Použít místní čas"
+
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
+msgid "Other"
+msgstr "Ostatní"
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr "Zvýrazňovaná slova (oddělená čárkou)"
 
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
-msgstr ""
+msgstr "Takhle to bude vypadat"
 
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr ""
+msgstr "Typ:"
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
-msgstr ""
+msgstr "Statický"
 
 #: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
 #: src/gui/setup_colors.cpp:408
 msgid "Pulse"
-msgstr "Puls"
+msgstr "Pulzní"
 
 #: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
 #: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
-msgstr "Duha"
+msgstr "Duhový"
 
 #: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
 #: src/gui/setup_colors.cpp:409
@@ -1852,35 +1895,31 @@ msgstr "Spektrum"
 
 #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr ""
+msgstr "Prodleva:"
 
 #: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr ""
+msgstr "Červená:"
 
 #: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr ""
+msgstr "Zelená:"
 
 #: src/gui/setup_colors.cpp:142
 msgid "Blue:"
-msgstr ""
+msgstr "Modrá:"
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
-msgstr ""
+msgstr "Průhlednost:"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:71
 msgid "Apply"
 msgstr "Použít"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:74
 msgid "Reset Windows"
-msgstr ""
-
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
+msgstr "Resetovat okna"
 
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
@@ -1912,11 +1951,11 @@ msgstr "Klávesnice"
 
 #: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
-msgstr ""
+msgstr "Přiřadit"
 
 #: src/gui/setup_keyboard.cpp:93
 msgid "Unassign"
-msgstr ""
+msgstr "Odebrat"
 
 #: src/gui/setup_keyboard.cpp:97
 msgid "Default"
@@ -1924,211 +1963,227 @@ msgstr "Výchozí"
 
 #: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "Kolize kláves detekovány."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
 msgid "Misc"
-msgstr ""
+msgstr "Ostatní"
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstra"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
-msgstr ""
+msgstr "Zobrazit poškození způsobené monstrům"
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
-msgstr ""
+msgstr "Automaticky zaměřovat pouze dosažitelná monstra"
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
-msgstr ""
+msgstr "Zvýraznit útočný dosah monster"
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
-msgstr ""
+msgstr "Zobrazit u monster pruh s životy"
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
-msgstr ""
+msgstr "Cyklovat zamířená monstra"
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
-msgstr ""
+msgstr "Zvýraznit portály na mapách"
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
-msgstr ""
+msgstr "Zvýraznit věci na zemi"
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
-msgstr ""
+msgstr "Zvýraznit hráčův útočný dosah"
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
-msgstr ""
+msgstr "Zobrazit rozšířené minimapy"
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
 msgid "Draw path"
-msgstr ""
+msgstr "Vykreslovat cestu"
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
-msgstr ""
+msgstr "Vykreslovat zkratky na mapě"
+
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
+msgstr "Zapnout líné rolování"
 
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr "Lenost rolování"
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr "Radius rolování"
+
+#: src/gui/setup_other.cpp:97
 msgid "Moving"
-msgstr ""
+msgstr "Pohyb"
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:99
 msgid "Auto fix position"
-msgstr ""
+msgstr "Automaticky opravovat pozici"
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:102
 msgid "Attack while moving"
-msgstr ""
+msgstr "Útočit během pohybu"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:105
 msgid "Sync player move"
-msgstr ""
+msgstr "Synchronizovat hráčův pohyb"
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:108
 msgid "Crazy move A program"
-msgstr ""
+msgstr "Program A šílených pohybů"
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:112
 msgid "Player"
-msgstr ""
+msgstr "hráč"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:114
 msgid "Show own hp bar"
-msgstr ""
+msgstr "Zobrazit vlastní pruh životů"
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:117
 msgid "Enable quick stats"
-msgstr ""
+msgstr "Zapnout rychlé statistiky"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
-msgstr ""
+msgstr "Cyklovat zamířené hráče"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:123
 msgid "Show job exp messages"
-msgstr ""
+msgstr "Zobrazovat zprávy o pracovních exp"
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:126
 msgid "Show players popups"
-msgstr ""
+msgstr "Zobrazovat popupy o hráčích"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:129
 msgid "Afk message"
-msgstr ""
+msgstr "Away zpráva"
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:132
 msgid "Show job"
-msgstr ""
+msgstr "Zobrazit práci"
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:135
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:138
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:144
 msgid "Accept sell/buy requests"
-msgstr ""
+msgstr "Akceptovat požadavky na koupi/prodej"
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:147
 msgid "Enable shop mode"
-msgstr ""
+msgstr "Zapnout mód obchodu"
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:153
 msgid "Log NPC dialogue"
-msgstr ""
+msgstr "Zaznamenávat dialogy s NPC"
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
-msgstr ""
+#: src/gui/setup_other.cpp:157
+msgid "Bots support"
+msgstr "Podpora botů"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:159
+msgid "Enable auction bot support"
+msgstr "Zapnout podporu AuctionBot-a"
+
+#: src/gui/setup_other.cpp:162
+msgid "Enable guild bot support and disable native guild support"
+msgstr "Zapnout podporu guild bota a vypnout nativní podporu gild"
+
+#: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:171
 msgid "Enable bot checker"
-msgstr ""
+msgstr "Zapnout ověřovač botů"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection"
-msgstr ""
+msgstr "Zapnout ochranu proti vadným serverům"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
-msgstr ""
+msgstr "Zapnout debug záznam"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
-msgstr ""
+msgstr "Mód nízké síťvé náročnosti"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
-msgstr ""
+msgstr "Skrýt zobrazení štítu"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
+msgstr "Zobrazit pozadí"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
-msgstr ""
+msgstr "Lepčí výkon (zapněte pro lepší výkon)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
-msgstr ""
+msgstr "Automatické nastavování výkonu"
 
 #: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
 msgid "Hw acceleration"
-msgstr ""
+msgstr "HW akcelerace"
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
 msgid "Better quality (disable for better perfomance)"
-msgstr ""
+msgstr "Lepší kvalita (vypněte pro lepší výkon)"
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr "Zobrazit objekty průhledné"
+
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
 msgstr ""
 
 #: src/gui/setup_perfomance.cpp:83
 msgid "Small memory (enable for lower memory usage)"
-msgstr ""
+msgstr "Málo paměti (zapněte pro nízké využití paměti)"
 
 #: src/gui/setup_perfomance.cpp:86
 msgid "Disable advanced beings caching (Software)"
@@ -2144,39 +2199,47 @@ msgstr "Hráči"
 
 #: src/gui/setup_players.cpp:54
 msgid "Show gender"
-msgstr ""
+msgstr "Zobrazit pohlaví"
 
 #: src/gui/setup_players.cpp:57
 msgid "Show level"
-msgstr ""
+msgstr "Zobrazit úroveň"
 
 #: src/gui/setup_players.cpp:60
 msgid "Show own name"
-msgstr ""
+msgstr "Zobrazit vlastní jméno"
 
 #: src/gui/setup_players.cpp:63
 msgid "Target dead players"
-msgstr ""
+msgstr "Zaměřovat mrtvé hráče"
 
 #: src/gui/setup_players.cpp:66
 msgid "Visible names"
-msgstr ""
+msgstr "Viditelná jména"
 
 #: src/gui/setup_players.cpp:69
 msgid "Secure trades"
-msgstr ""
+msgstr "Bezpečné obchody"
 
 #: src/gui/setup_players.cpp:72
 msgid "Unsecure chars in names"
-msgstr ""
+msgstr "Nebezpečné znaky ve jménech"
 
 #: src/gui/setup_players.cpp:75
 msgid "Show statuses"
-msgstr ""
+msgstr "Zobrazovat statusy"
+
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr "Zobrazovat IP adresy ve snímcích obrazovky"
+
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr "Povolit léčení sebe sama kliknutím myši"
 
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
-msgstr ""
+msgstr "Vztahy"
 
 #: src/gui/setup_relations.cpp:70
 msgid "Neutral"
@@ -2184,19 +2247,19 @@ msgstr "Neutrální"
 
 #: src/gui/setup_relations.cpp:71
 msgid "Friend"
-msgstr ""
+msgstr "Přítel"
 
 #: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
-msgstr ""
+msgstr "Přehlížený"
 
 #: src/gui/setup_relations.cpp:73
 msgid "Ignored"
-msgstr ""
+msgstr "Ignorovaný"
 
 #: src/gui/setup_relations.cpp:74
 msgid "Erased"
-msgstr ""
+msgstr "Vymazán"
 
 #: src/gui/setup_relations.cpp:239
 msgid "Allow trading"
@@ -2204,96 +2267,100 @@ msgstr "Povolit obchodování"
 
 #: src/gui/setup_relations.cpp:241
 msgid "Allow whispers"
-msgstr ""
+msgstr "Povolit šeptání"
 
 #: src/gui/setup_relations.cpp:244
 msgid "Old"
-msgstr ""
+msgstr "Starý"
 
 #: src/gui/setup_relations.cpp:246
 msgid "Relations"
-msgstr ""
+msgstr "Vztahy"
 
 #: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
-msgstr ""
+msgstr "Když ignoruji:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
 msgid "Tiny (10)"
-msgstr ""
+msgstr "Mrňavý (10)"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Small (11)"
-msgstr ""
+msgstr "Malý (11)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Medium (12)"
-msgstr ""
+msgstr "Střední (12)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Large (13)"
-msgstr ""
+msgstr "Velký (13)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Big (14)"
-msgstr ""
+msgstr "Větší (14)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Huge (15)"
-msgstr ""
+msgstr "Obrovský (15)"
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
 msgid "Theme"
-msgstr ""
+msgstr "Téma"
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
 msgid "Gui theme"
-msgstr ""
+msgstr "Téma GUI"
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
 msgid "Main Font"
-msgstr ""
+msgstr "Hlavní font"
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
 msgid "Bold font"
-msgstr ""
+msgstr "Tučný font"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
 msgid "Particle font"
-msgstr ""
+msgstr "Font částic"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
 msgid "Help font"
-msgstr ""
+msgstr "Pomocný font"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
 msgid "Secure font"
-msgstr ""
+msgstr "Bezpečný font"
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr "Japonský font"
+
+#: src/gui/setup_theme.cpp:183
 msgid "Font size"
 msgstr "Velikost písma"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
 msgid "Theme Changed"
-msgstr ""
+msgstr "Téma změněno"
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
-msgstr ""
+msgstr "Restartujte klient pro aplikováni změn."
 
 #: src/gui/setup_video.cpp:194
 msgid "Software"
-msgstr ""
+msgstr "Softwarový"
 
 #: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
-msgstr ""
+msgstr "Rychlé OpenGL"
 
 #: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
-msgstr ""
+msgstr "Bezpečné OpenGL"
 
 #: src/gui/setup_video.cpp:223
 msgid "No text"
@@ -2305,11 +2372,11 @@ msgstr "Text"
 
 #: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
-msgstr ""
+msgstr "Bubliny, beze jmen"
 
 #: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
-msgstr ""
+msgstr "Bubliny se jmény"
 
 #: src/gui/setup_video.cpp:242
 msgid "off"
@@ -2341,34 +2408,30 @@ msgstr "Vlastní kurzor"
 
 #: src/gui/setup_video.cpp:291
 msgid "Particle effects"
-msgstr ""
+msgstr "Částicové efekty"
 
 #: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
-msgstr ""
+msgstr "Zobrazit informaci o sebrání předmětu"
 
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:295
 msgid "in chat"
-msgstr ""
+msgstr "v chatu"
 
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:297
 msgid "as particle"
-msgstr ""
+msgstr "jako částici"
 
 #: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr ""
+msgstr "Omezení FPS:"
 
 #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
 msgid "Alt FPS limit: "
-msgstr ""
-
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Video"
+msgstr "Altern. FPS omezení:"
 
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
@@ -2376,7 +2439,7 @@ msgstr ""
 
 #: src/gui/setup_video.cpp:322
 msgid "Gui opacity"
-msgstr ""
+msgstr "Neprůhlednost GUI"
 
 #: src/gui/setup_video.cpp:323
 msgid "Ambient FX"
@@ -2384,27 +2447,30 @@ msgstr ""
 
 #: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr ""
+msgstr "Detaily částic"
 
 #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
 msgid "None"
-msgstr ""
+msgstr "Žádné"
 
 #: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
+"Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
 
 #: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
+"Selhalo přepnutí do módu celé obrazovky a obnovení předchozího módu taktéž "
+"selhalo!"
 
 #: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr ""
+msgstr "Přepínám na celou obrazovku"
 
 #: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
@@ -2412,7 +2478,7 @@ msgstr "Pro uplatnění změn je potřeba restart."
 
 #: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr ""
+msgstr "Měním na OpenGL"
 
 #: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
@@ -2420,285 +2486,290 @@ msgstr "Změny v OpenGL vyžadují restart."
 
 #: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
-msgstr ""
+msgstr "Vlastní rozlišení (příklad: 1024x768)"
 
 #: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
-msgstr ""
+msgstr "Zadej nové rozlišení:"
 
 #: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr ""
+msgstr "Rozlišení obrazovky změněno"
 
 #: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
+msgstr "Některá okna mohou být přesunuta aby se vešly do menšího okna."
 
 #: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr ""
+msgstr "Nastavení částicových efektů bylo změněno."
 
 #: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
 msgstr "Změny se projeví až po změně mapy."
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
 msgid "Personal Shop"
-msgstr ""
+msgstr "Osobní obchod"
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
 msgid "Buy items"
-msgstr ""
+msgstr "Koupit věci"
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
 msgid "Sell items"
-msgstr ""
+msgstr "Prodat věci"
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
 msgid "Add"
 msgstr "Přidat"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
 msgid "Announce"
-msgstr ""
+msgstr "Oznámit"
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
 msgid "Show links in announce"
-msgstr ""
+msgstr "Zobrazit odkazy v oznámení"
+
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr "Aukce"
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
-msgstr ""
+msgstr "Požadavek k obchodování"
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
 #, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr ""
+msgstr "%s chce %s %s příjímáte?"
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Dovednosti"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
-msgstr ""
+msgstr "Zvýšit"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
-msgstr "Guilda"
+msgstr "Gilda"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "Pozvali jste %s do gildy %s."
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
 #, c-format
 msgid "Guild %s quit requested."
-msgstr ""
+msgstr "Požadován odchod z gildy %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "Člen pozval do gildy"
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "Koho byste rád pozval do gildy %s?"
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
 msgid "Leave Guild?"
-msgstr ""
+msgstr "Opustit gildu?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr ""
+msgstr "Jste si jisti že chcete opustit gildu %s?"
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Parta"
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
 msgid "Priority mobs"
-msgstr ""
+msgstr "Prioritní monstra"
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
 msgid "Attack mobs"
-msgstr ""
+msgstr "Útočit na monstra"
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
 msgid "Ignore mobs"
-msgstr ""
+msgstr "Ignorovat monstra"
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
 msgid "Create Guild"
-msgstr "Vytvořit guildu"
+msgstr "Vytvořit gildu"
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
 msgid "Create Party"
-msgstr ""
+msgstr "Vytvořit partu"
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
 msgid "Social"
-msgstr ""
+msgstr "Společenství"
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
 msgid "Invite"
-msgstr ""
+msgstr "Pozvat"
 
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
 #, c-format
 msgid "Accepted party invite from %s."
-msgstr ""
+msgstr "Přijato pozvání do party od %s."
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
 #, c-format
 msgid "Rejected party invite from %s."
-msgstr ""
+msgstr "Odmítnuto přijetí do party od %s."
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
 #, c-format
 msgid "Accepted guild invite from %s."
-msgstr ""
+msgstr "Přijato pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
 #, c-format
 msgid "Rejected guild invite from %s."
-msgstr ""
+msgstr "Odmítnuto pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Creating guild called %s."
-msgstr ""
+msgstr "Vytvářím gildu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "Vytvářím partu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
 msgid "Guild Name"
-msgstr ""
+msgstr "Název gildy"
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
 msgid "Choose your guild's name."
-msgstr ""
+msgstr "Zvolte jméno vaší gildy."
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
 msgid "Received guild request, but one already exists."
-msgstr ""
+msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje."
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
 #, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr ""
+msgstr "%s vás zve ke vstupu do gildy %s."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
 msgid "Accept Guild Invite"
-msgstr ""
+msgstr "Přílmout pozvání do gildy"
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
 msgid "Received party request, but one already exists."
-msgstr ""
+msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje."
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
 msgid "You have been invited you to join a party."
-msgstr ""
+msgstr "Byli jste pozváni k připojení se do party."
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
 #, c-format
 msgid "You have been invited to join the %s party."
-msgstr ""
+msgstr "Byli jste pozváni k připojení se do party %s."
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
 #, c-format
 msgid "%s has invited you to join their party."
-msgstr "%s vás zve ke vstupu do své party."
+msgstr "%s vás pozval ke vstupu do své party."
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "%s has invited you to join the %s party."
-msgstr "%s vás zve ke vstupu do party: %s"
+msgstr "%s vás zve ke vstupu do party: %s."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "Nemohu vytvořit partu. Již jste členem party."
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
 msgid "Party Name"
-msgstr ""
+msgstr "Jméno party"
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
 msgid "Choose your party's name."
-msgstr ""
+msgstr "Zvolte jméno vaší party."
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
@@ -2706,79 +2777,79 @@ msgstr ""
 
 #: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
-msgstr ""
+msgstr "(D) výchozí pohyby"
 
 #: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
-msgstr ""
+msgstr "(I) invertované pohyby"
 
 #: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
-msgstr ""
+msgstr "(c) pohyby s trochou šílených pohybů"
 
 #: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
-msgstr ""
+msgstr "(C) pohyby s šílenými pohyby"
 
 #: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
-msgstr ""
+msgstr "(d) dvojité normální + šílené"
 
 #: src/gui/statuspopup.cpp:222
 msgid "(?) move"
-msgstr ""
+msgstr "(?) pohyb"
 
 #: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
-msgstr ""
+msgstr "(a) vlastní šílené pohyby"
 
 #: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
-msgstr ""
+msgstr "(?) šílené pohyby"
 
 #: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
-msgstr ""
+msgstr "(0) výchozí pohyb k cíli"
 
 #: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
-msgstr ""
+msgstr "(1) pohyb k cíli do vzdálenosti 1"
 
 #: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
-msgstr ""
+msgstr "(2) pohyb k cíli do vzdálenosti 2"
 
 #: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
-msgstr ""
+msgstr "(3) pohyb k cíli do vzdálenosti 3"
 
 #: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
-msgstr ""
+msgstr "(5) pohyb k cíli do vzdálenosti 5"
 
 #: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
-msgstr ""
+msgstr "(7) pohyb k cíli do vzdálenosti 7"
 
 #: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
-msgstr ""
+msgstr "(A) pohyb k cíli na útočný dosah"
 
 #: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
-msgstr ""
+msgstr "(?) pohyb k cíli"
 
 #: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
-msgstr ""
+msgstr "(D) výchozí následování"
 
 #: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
-msgstr ""
+msgstr "(R) relativní následování"
 
 #: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
-msgstr ""
+msgstr "(M) zrcadlené následování"
 
 #: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
@@ -2786,151 +2857,151 @@ msgstr ""
 
 #: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
-msgstr ""
+msgstr "(?) neznámé následování"
 
 #: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
-msgstr ""
+msgstr "(D) výchozí útok"
 
 #: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
-msgstr ""
+msgstr "(s) přepínat útok bez štítu"
 
 #: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
-msgstr ""
+msgstr "(S) přepínat útok se štítem"
 
 #: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
-msgstr ""
+msgstr "(?) útok"
 
 #: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
-msgstr ""
+msgstr "(G) jdi a útoč"
 
 #: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
-msgstr ""
+msgstr "(A) jdi, útoč, sbírej"
 
 #: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
-msgstr ""
+msgstr "(d) bez automatického útoku"
 
 #: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
-msgstr ""
+msgstr "(S) malý sběr 1x1 pole"
 
 #: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
-msgstr ""
+msgstr "(D) výchozí sběr 2x1 pole"
 
 #: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
-msgstr ""
+msgstr "(F) sběr před 2x3 pole"
 
 #: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
-msgstr ""
+msgstr "(3) sběr 3x3 pole"
 
 #: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
-msgstr ""
+msgstr "(g) jdi a seber do vzdálenosti 4"
 
 #: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
-msgstr ""
+msgstr "(G) jdi a seber do vzdálenosti 8"
 
 #: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
-msgstr ""
+msgstr "(A) jdi a seber do max. vzdálenosti"
 
 #: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
-msgstr ""
+msgstr "(?) sběr"
 
 #: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
-msgstr ""
+msgstr "(N) Normální zobrazení mapy"
 
 #: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
-msgstr ""
+msgstr "(D) debug zobrazení mapy"
 
 #: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
-msgstr ""
+msgstr "(u) ultra zobrazení mapy"
 
 #: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
-msgstr ""
+msgstr "(U) ultra zobrazení mapy 2"
 
 #: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
-msgstr ""
+msgstr "(e) zobrazen prázdné mapy"
 
 #: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
-msgstr ""
+msgstr "(b) zobrazení černobílé mapy"
 
 #: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
-msgstr ""
+msgstr "(?) zobrazení pamy"
 
 #: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
-msgstr ""
+msgstr "(f) použij #flar pro magický útok"
 
 #: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
-msgstr ""
+msgstr "(c) použij #chiza pro magický útok"
 
 #: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
-msgstr ""
+msgstr "(I) použij #ingrav pro magický útok"
 
 #: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
-msgstr ""
+msgstr "(F) použij #frillyar pro magický útok"
 
 #: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
-msgstr ""
+msgstr "(U) použij #upmarmu pro magický útok"
 
 #: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
-msgstr ""
+msgstr "(?) magický útok attack"
 
 #: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
-msgstr ""
+msgstr "(D) výchozí imitace"
 
 #: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
-msgstr ""
+msgstr "(O) imitace výstroje"
 
 #: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
-msgstr ""
+msgstr "(?) imitace"
 
 #: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
-msgstr ""
+msgstr "(O) u počítače"
 
 #: src/gui/statuspopup.cpp:497
 msgid "(A) away"
-msgstr ""
+msgstr "(A) pryč (away)"
 
 #: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
-msgstr ""
+msgstr "(?) away"
 
 #: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
-msgstr ""
+msgstr "(G) mód herní kamery"
 
 #: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
-msgstr ""
+msgstr "(F) mód volné kamery"
 
 #: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
@@ -2938,194 +3009,194 @@ msgstr ""
 
 #: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
-msgstr ""
+msgstr "Modifikátory hry jsou vypnuty"
 
 #: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
-msgstr ""
+msgstr "Modifikátory hry jsou zapnuty"
 
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
 #, c-format
 msgid "Money: %s"
 msgstr "Peníze: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:150
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:157
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:171
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
 #, c-format
 msgid "Job: %d"
-msgstr ""
+msgstr "Práce: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:204
 msgid "Job:"
-msgstr ""
+msgstr "Práce:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Character points: %d"
-msgstr ""
+msgstr "Bodů postavy: %d"
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:268
 #, c-format
 msgid "Level: %d (GM %d)"
-msgstr ""
+msgstr "Úroveň: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:324
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
 msgid "(D)"
-msgstr ""
+msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
 msgid "(I)"
-msgstr ""
+msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
 msgid "(c)"
-msgstr ""
+msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:656
 msgid "(C)"
-msgstr ""
+msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
 msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgstr "(d)"
+
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
 msgid "(?)"
-msgstr ""
+msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:673
 msgid "(a)"
-msgstr ""
+msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:684
 msgid "(0)"
-msgstr ""
+msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:687
 msgid "(1)"
-msgstr ""
+msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:690
 msgid "(2)"
-msgstr ""
+msgstr " (2)"
 
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
 msgid "(3)"
-msgstr ""
+msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:696
 msgid "(5)"
-msgstr ""
+msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:699
 msgid "(7)"
-msgstr ""
+msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
 msgid "(A)"
-msgstr ""
+msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:715
 msgid "(R)"
-msgstr ""
+msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:718
 msgid "(M)"
-msgstr ""
+msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:721
 msgid "(P)"
-msgstr ""
+msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:735
 msgid "(s)"
-msgstr ""
+msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
 msgid "(S)"
-msgstr ""
+msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
 msgid "(G)"
-msgstr ""
+msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:767
 msgid "(f)"
-msgstr ""
+msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
 msgid "(F)"
-msgstr ""
+msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
 msgid "(U)"
-msgstr ""
+msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:803
 msgid "(g)"
-msgstr ""
+msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:820
 msgid "(N)"
-msgstr ""
+msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:826
 msgid "(u)"
-msgstr ""
+msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:832
 msgid "(e)"
-msgstr ""
+msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:835
 msgid "(b)"
-msgstr ""
+msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
 msgid "(O)"
-msgstr ""
+msgstr "(O)"
 
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr ""
+msgstr "Žádný cíl"
 
 #: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr ""
+msgstr " "
 
 #: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
@@ -3133,39 +3204,39 @@ msgstr ""
 
 #: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr ""
+msgstr "Obecná magie"
 
 #: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr ""
+msgstr "Magie života"
 
 #: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr ""
+msgstr "Magie války"
 
 #: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
-msgstr ""
+msgstr "Magie přeměn"
 
 #: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
-msgstr ""
+msgstr "Magie přírody"
 
 #: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
-msgstr ""
+msgstr "Magie hvězd"
 
 #: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
-msgstr ""
+msgstr "Editor příkazů"
 
 #: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr ""
+msgstr "magie"
 
 #: src/gui/textcommandeditor.cpp:189
 msgid "other"
-msgstr ""
+msgstr "ostatní"
 
 #: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
@@ -3173,35 +3244,35 @@ msgstr ""
 
 #: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr ""
+msgstr "Příkaz:"
 
 #: src/gui/textcommandeditor.cpp:200
 msgid "Mana:"
-msgstr ""
+msgstr "Mana:"
 
 #: src/gui/textcommandeditor.cpp:206
 msgid "Target Type:"
-msgstr ""
+msgstr "Typ cíle:"
 
 #: src/gui/textcommandeditor.cpp:212
 msgid "Icon:"
-msgstr ""
+msgstr "Ikona:"
 
 #: src/gui/textcommandeditor.cpp:218
 msgid "Magic level:"
-msgstr ""
+msgstr "Úroveň magie:"
 
 #: src/gui/textcommandeditor.cpp:224
 msgid "Magic School:"
-msgstr ""
+msgstr "Škola magie:"
 
 #: src/gui/textcommandeditor.cpp:230
 msgid "School level:"
-msgstr ""
+msgstr "Úroveň školy:"
 
 #: src/gui/textcommandeditor.cpp:235
 msgid "Save"
-msgstr ""
+msgstr "Uložit"
 
 #: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
@@ -3209,7 +3280,7 @@ msgstr "Nabídnout obchod"
 
 #: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
-msgstr ""
+msgstr "Potvrzeno. Čekám..."
 
 #: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
@@ -3217,68 +3288,67 @@ msgstr "Souhlasit s obchodem"
 
 #: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
-msgstr ""
+msgstr "Odsouhlaseno. Čekám..."
 
 #: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
-msgstr ""
+msgstr "Obchod: Ty"
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
-msgstr ""
+msgstr "Dostaneš: %s"
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
-msgstr ""
+msgstr "Dáváš:"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "Změnit"
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:375
 msgid "You don't have enough money."
 msgstr "Nemáte dost peněz."
 
+#: src/gui/tradewindow.cpp:454
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
 msgid "Play"
 msgstr "Hrát"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
 msgid "##1  The update process is incomplete."
-msgstr ""
+msgstr "##1  Proces aktualizace není kompletní."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
 msgid "##1  It is strongly recommended that"
-msgstr ""
+msgstr "##1  silně doporučujeme zkusit"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
 msgid "##1  you try again later."
-msgstr ""
+msgstr "##1  aktualizaci později"
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
 msgid "Completed"
-msgstr ""
+msgstr "Hotovo"
 
 #: src/gui/userpalette.cpp:116
 msgid "Being"
@@ -3286,19 +3356,19 @@ msgstr ""
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
-msgstr ""
+msgstr "Jména přátel"
 
 #: src/gui/userpalette.cpp:118
 msgid "Disregarded Names"
-msgstr ""
+msgstr "Jména přehlížených"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
-msgstr ""
+msgstr "Jména ignorovaných"
 
 #: src/gui/userpalette.cpp:120
 msgid "Erased Names"
-msgstr ""
+msgstr "Jména vymazaných"
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3306,7 +3376,7 @@ msgstr "Jména ostatních hráčů"
 
 #: src/gui/userpalette.cpp:122
 msgid "Own Name"
-msgstr ""
+msgstr "Vlastní jméno"
 
 #: src/gui/userpalette.cpp:123
 msgid "GM Names"
@@ -3314,55 +3384,55 @@ msgstr "Jména GM"
 
 #: src/gui/userpalette.cpp:124
 msgid "NPCs"
-msgstr ""
+msgstr "Jména NPC"
 
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
-msgstr ""
+msgstr "Pruh HP monster"
 
 #: src/gui/userpalette.cpp:128
 msgid "Monster HP bar (second color)"
-msgstr ""
+msgstr "Pruh HP monster (druhá barva)"
 
 #: src/gui/userpalette.cpp:129
 msgid "Party Members"
-msgstr ""
+msgstr "Členové party"
 
 #: src/gui/userpalette.cpp:130
 msgid "Guild Members"
-msgstr ""
+msgstr "Členové gildy"
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
-msgstr ""
+msgstr "Částicové efekty"
 
 #: src/gui/userpalette.cpp:132
 msgid "Pickup Notification"
-msgstr ""
+msgstr "Oznámení o sběru"
 
 #: src/gui/userpalette.cpp:133
 msgid "Exp Notification"
-msgstr ""
+msgstr "Oznámení o zkušenostech"
 
 #: src/gui/userpalette.cpp:134
 msgid "Player HP bar"
-msgstr ""
+msgstr "Hráčův HP pruh"
 
 #: src/gui/userpalette.cpp:136
 msgid "Player HP bar (second color)"
-msgstr ""
+msgstr "Hráčův HP pruh (druhá barva)"
 
 #: src/gui/userpalette.cpp:137
 msgid "Player Hits Monster"
-msgstr ""
+msgstr "Hráč zasáhne monstrum"
 
 #: src/gui/userpalette.cpp:138
 msgid "Monster Hits Player"
-msgstr ""
+msgstr "Monstrum zasáhne hráče"
 
 #: src/gui/userpalette.cpp:140
 msgid "Other Player Hits Local Player"
-msgstr ""
+msgstr "Hráč zasáhne místního hráče"
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
@@ -3370,87 +3440,87 @@ msgstr "Kritický zásah"
 
 #: src/gui/userpalette.cpp:143
 msgid "Local Player Hits Monster"
-msgstr ""
+msgstr "Místní hráč zasáhne monstrum"
 
 #: src/gui/userpalette.cpp:145
 msgid "Local Player Critical Hit"
-msgstr ""
+msgstr "Kritický zásah místního hráče"
 
 #: src/gui/userpalette.cpp:147
 msgid "Local Player Miss"
-msgstr ""
+msgstr "Místní hráč minul"
 
 #: src/gui/userpalette.cpp:148
 msgid "Misses"
-msgstr ""
+msgstr "Minutí"
 
 #: src/gui/userpalette.cpp:149
 msgid "Portal Highlight"
-msgstr ""
+msgstr "Zvýraznění portálů"
 
 #: src/gui/userpalette.cpp:151
 msgid "Default collision Highlight"
-msgstr ""
+msgstr "Zvýraznění výchozí kolize"
 
 #: src/gui/userpalette.cpp:153
 msgid "Air collision Highlight"
-msgstr ""
+msgstr "Zvýraznění vzdušné kolize"
 
 #: src/gui/userpalette.cpp:155
 msgid "Water collision Highlight"
-msgstr ""
+msgstr "Zvýraznění vodní kolize"
 
 #: src/gui/userpalette.cpp:157
 msgid "Walkable Highlight"
-msgstr ""
+msgstr "Zvýraznění schůdnosti"
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
-msgstr ""
+msgstr "Útočný dosah místního hráče"
 
 #: src/gui/userpalette.cpp:161
 msgid "Local Player Attack Range Border"
-msgstr ""
+msgstr "Hranice útočného dosahu místního hráče"
 
 #: src/gui/userpalette.cpp:163
 msgid "Monster Attack Range"
-msgstr ""
+msgstr "Útočný dosah monstra"
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
-msgstr ""
+msgstr "Domovské místo"
 
 #: src/gui/userpalette.cpp:167
 msgid "Home Place Border"
-msgstr ""
+msgstr "Hranice domácího místa"
 
 #: src/gui/userpalette.cpp:169
 msgid "Road Point"
-msgstr ""
+msgstr "Bod cesty"
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
 msgid "Who Is Online - Updating"
-msgstr ""
+msgstr "Kdo je online - Obnovuji"
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:104
 msgid "Update"
-msgstr ""
+msgstr "Obnovit"
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:297
 msgid "Who Is Online - "
-msgstr ""
+msgstr "Kdo je online - "
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:488
 msgid "Who Is Online - error"
-msgstr ""
+msgstr "Kdo je online - chyba"
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:519
 msgid "Who Is Online - Update"
 msgstr ""
 
 #: src/gui/widgets/battletab.cpp:45
 msgid "Battle"
-msgstr ""
+msgstr "Bitvy"
 
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
@@ -3509,7 +3579,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Pokud <nick> obsahuje mezeru, uzavřete jej do uvozovek (\")."
 
@@ -3547,6 +3618,45 @@ msgstr "Globální oznámení od %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Upravit"
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3580,8 +3690,7 @@ msgid "Command: /unignore <player>"
 msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-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:65
@@ -3590,7 +3699,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:65
 msgid "Bot checker"
-msgstr ""
+msgstr "Ověřovač botů"
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
@@ -3598,7 +3707,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:67
 msgid "Who is online"
-msgstr ""
+msgstr "Kdo je online"
 
 #: src/gui/windowmenu.cpp:69
 msgid "KS"
@@ -3606,7 +3715,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:71
 msgid "Smilies"
-msgstr ""
+msgstr "Smajlíci"
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
@@ -3642,7 +3751,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:94
 msgid "Shortcuts"
-msgstr ""
+msgstr "Zkratky"
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
@@ -3658,7 +3767,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "Víte že"
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
@@ -3666,39 +3775,39 @@ msgstr ""
 
 #: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr ""
+msgstr "Zvol svět"
 
 #: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr ""
+msgstr "Změň přihlášení"
 
 #: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr ""
+msgstr "vyber svět"
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
-msgstr ""
+msgstr "Úložiště"
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
-msgstr ""
+msgstr "Košík"
 
 #: src/keyboardconfig.cpp:43
 msgid "Move Up"
-msgstr ""
+msgstr "Pohyb nahoru"
 
 #: src/keyboardconfig.cpp:44
 msgid "Move Down"
-msgstr ""
+msgstr "Pohyb dolů"
 
 #: src/keyboardconfig.cpp:45
 msgid "Move Left"
-msgstr ""
+msgstr "Pohyb vlevo"
 
 #: src/keyboardconfig.cpp:46
 msgid "Move Right"
-msgstr ""
+msgstr "Pohyb vpravo"
 
 #: src/keyboardconfig.cpp:49
 msgid "Target & Attack"
@@ -3706,19 +3815,19 @@ msgstr "Cíl & Útok"
 
 #: src/keyboardconfig.cpp:51
 msgid "Move to Target"
-msgstr ""
+msgstr "Přejít k cíli"
 
 #: src/keyboardconfig.cpp:53
 msgid "Change Move to Target type"
-msgstr ""
+msgstr "Změnit typ přesunu k cíli"
 
 #: src/keyboardconfig.cpp:55
 msgid "Move to Home location"
-msgstr ""
+msgstr "Přejít na domácí místo"
 
 #: src/keyboardconfig.cpp:57
 msgid "Set home location"
-msgstr ""
+msgstr "Nastavit domácí místo"
 
 #: src/keyboardconfig.cpp:59
 msgid "Move to navigation point"
@@ -3734,27 +3843,27 @@ msgstr "Zastavit Útok"
 
 #: src/keyboardconfig.cpp:64
 msgid "Target Closest"
-msgstr ""
+msgstr "Zaměřit nejbližší"
 
 #: src/keyboardconfig.cpp:66
 msgid "Target NPC"
-msgstr ""
+msgstr "Zaměřit NPC"
 
 #: src/keyboardconfig.cpp:67
 msgid "Target Player"
-msgstr ""
+msgstr "Zaměřit hráče"
 
 #: src/keyboardconfig.cpp:69
 msgid "Pickup"
-msgstr ""
+msgstr "Sebrat"
 
 #: src/keyboardconfig.cpp:70
 msgid "Change Pickup Type"
-msgstr ""
+msgstr "Změnit typ sběru"
 
 #: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
-msgstr ""
+msgstr "Skrýt okna"
 
 #: src/keyboardconfig.cpp:74
 msgid "Sit"
@@ -3766,11 +3875,11 @@ msgstr "Snímek obrazovky"
 
 #: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
-msgstr ""
+msgstr "Zapnout/Vypnout obchody"
 
 #: src/keyboardconfig.cpp:78
 msgid "Change Map View Mode"
-msgstr ""
+msgstr "Změnit mód zobrazení mapy"
 
 #: src/keyboardconfig.cpp:80
 msgid "Item Shortcuts Key"
@@ -3793,31 +3902,31 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:122
 msgid "Help Window"
-msgstr ""
+msgstr "Okno nápovědy"
 
 #: src/keyboardconfig.cpp:124
 msgid "Status Window"
-msgstr ""
+msgstr "Stavové okno"
 
 #: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
-msgstr ""
+msgstr "Okno inventáře"
 
 #: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
-msgstr ""
+msgstr "Okno vybavení"
 
 #: src/keyboardconfig.cpp:130
 msgid "Skill Window"
-msgstr ""
+msgstr "Okno dovedností"
 
 #: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
-msgstr ""
+msgstr "Okno s minimapou"
 
 #: src/keyboardconfig.cpp:134
 msgid "Chat Window"
-msgstr ""
+msgstr "Okno s chatem"
 
 #: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
@@ -3825,27 +3934,27 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:138
 msgid "Setup Window"
-msgstr ""
+msgstr "Okno nastavení"
 
 #: src/keyboardconfig.cpp:140
 msgid "Debug Window"
-msgstr ""
+msgstr "Debug okno"
 
 #: src/keyboardconfig.cpp:142
 msgid "Social Window"
-msgstr ""
+msgstr "Okno spolešenství"
 
 #: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
-msgstr ""
+msgstr "Okno zkratek smajlíků"
 
 #: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
-msgstr ""
+msgstr "Okno výstroje"
 
 #: src/keyboardconfig.cpp:148
 msgid "Shop Window"
-msgstr ""
+msgstr "Okno s obchodem"
 
 #: src/keyboardconfig.cpp:150
 msgid "Quick drop Window"
@@ -3865,19 +3974,19 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:159
 msgid "Who Is Online Window"
-msgstr ""
+msgstr "Okno \"Kdo je online\""
 
 #: src/keyboardconfig.cpp:161
 msgid "Did you know Window"
-msgstr ""
+msgstr "Okno \"Víte že...\""
 
 #: src/keyboardconfig.cpp:164
 msgid "Previous Social Tab"
-msgstr ""
+msgstr "Předchozí záložka společenství"
 
 #: src/keyboardconfig.cpp:166
 msgid "Next Social Tab"
-msgstr ""
+msgstr "Další záložka společenství"
 
 #: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
 #: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
@@ -3904,95 +4013,95 @@ msgstr ""
 #: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
-msgstr ""
+msgstr "Zkratka smajlíku %d"
 
 #: src/keyboardconfig.cpp:261
 msgid "Wear Outfit"
-msgstr ""
+msgstr "Obléct výstroj"
 
 #: src/keyboardconfig.cpp:263
 msgid "Copy Outfit"
-msgstr ""
+msgstr "Kopírovat výstroj"
 
 #: src/keyboardconfig.cpp:265
 msgid "Copy equipped to Outfit"
-msgstr ""
+msgstr "Kopírovat výbavu do výstroje"
 
 #: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
-msgstr ""
+msgstr "Přepnout chat"
 
 #: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
-msgstr ""
+msgstr "Rolovat chat nahoru"
 
 #: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
-msgstr ""
+msgstr "Rolovat chat dolů"
 
 #: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
-msgstr ""
+msgstr "Předchozí záložka chatu"
 
 #: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
-msgstr ""
+msgstr "Další záložka chatu"
 
 #: src/keyboardconfig.cpp:278
 msgid "Close current Chat Tab"
-msgstr ""
+msgstr "Zavřít stávající záložku chatu"
 
 #: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
-msgstr ""
+msgstr "Předchozí řádek chatu"
 
 #: src/keyboardconfig.cpp:282
 msgid "Next chat line"
-msgstr ""
+msgstr "Další řádek chatu"
 
 #: src/keyboardconfig.cpp:284
 msgid "Chat Auto Complete"
-msgstr ""
+msgstr "Autodoplňování v chatu"
 
 #: src/keyboardconfig.cpp:286
 msgid "Deactivate Chat Input"
-msgstr ""
+msgstr "Deaktivovat vstup chatu"
 
 #: src/keyboardconfig.cpp:288
 msgid "Select OK"
-msgstr ""
+msgstr "Vybrat OK"
 
 #: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
-msgstr ""
+msgstr "Ignorovat vstup 1"
 
 #: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
-msgstr ""
+msgstr "Ignorovat vstup 2"
 
 #: src/keyboardconfig.cpp:295
 msgid "Direct Up"
-msgstr ""
+msgstr "Otočit nahoru"
 
 #: src/keyboardconfig.cpp:296
 msgid "Direct Down"
-msgstr ""
+msgstr "Otočit dolů"
 
 #: src/keyboardconfig.cpp:298
 msgid "Direct Left"
-msgstr ""
+msgstr "Otočit vlevo"
 
 #: src/keyboardconfig.cpp:299
 msgid "Direct Right"
-msgstr ""
+msgstr "Otočit vpravo"
 
 #: src/keyboardconfig.cpp:301
 msgid "Crazy moves"
-msgstr ""
+msgstr "Šílené pohyby"
 
 #: src/keyboardconfig.cpp:303
 msgid "Change Crazy Move mode"
-msgstr ""
+msgstr "Změnit mód šílených pohybů"
 
 #: src/keyboardconfig.cpp:305
 msgid "Quick Drop N Items from 0 slot"
@@ -4008,39 +4117,39 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:311
 msgid "Quick heal target or self"
-msgstr ""
+msgstr "Rychlé léčení cíle nebo sebe"
 
 #: src/keyboardconfig.cpp:313
 msgid "Use #itenplz spell"
-msgstr ""
+msgstr "Použít kouzlo #itenplz"
 
 #: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
-msgstr ""
+msgstr "Použít magický útok"
 
 #: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
-msgstr ""
+msgstr "Přepnout magický útok"
 
 #: src/keyboardconfig.cpp:319
 msgid "Change move type"
-msgstr ""
+msgstr "Změnit typ pohybu"
 
 #: src/keyboardconfig.cpp:321
 msgid "Change Attack Weapon Type"
-msgstr ""
+msgstr "Změnit typ útočné zbraně"
 
 #: src/keyboardconfig.cpp:323
 msgid "Change Attack Type"
-msgstr ""
+msgstr "Změnit typ útoku"
 
 #: src/keyboardconfig.cpp:325
 msgid "Change Follow mode"
-msgstr ""
+msgstr "Změnit mód následování"
 
 #: src/keyboardconfig.cpp:327
 msgid "Change Imitation mode"
-msgstr ""
+msgstr "Změnit mód imitace"
 
 #: src/keyboardconfig.cpp:330
 msgid "Disable / Enable Game modifier keys"
@@ -4048,23 +4157,23 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:331
 msgid "On / Off audio"
-msgstr ""
+msgstr "Zapnout/Vypnout audio"
 
 #: src/keyboardconfig.cpp:333
 msgid "Enable / Disable away mode"
-msgstr ""
+msgstr "Zapnout/Vypnout Away mód"
 
 #: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
-msgstr ""
+msgstr "Emulovat pravý klik z klávesnice"
 
 #: src/keyboardconfig.cpp:337
 msgid "Toggle camera mode"
-msgstr ""
+msgstr "přemnout mód kamery"
 
 #: src/keyboardconfig.cpp:339
 msgid "Modifier key"
-msgstr ""
+msgstr "Klávesa modifikátoru"
 
 #: src/keyboardconfig.cpp:411
 #, c-format
@@ -4072,42 +4181,44 @@ msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
+"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
+"chovat podivně."
 
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:377
 msgid "You were killed by "
-msgstr ""
+msgstr "Zabil vás "
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
-msgstr ""
+msgstr "Snažili jste se sebrat neexistující předmět."
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
-msgstr ""
+msgstr "Předmět je příliš těžký."
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
-msgstr ""
+msgstr "Předmět je příliš daleko."
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
-msgstr ""
+msgstr "Inventář je plný."
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
-msgstr ""
+msgstr "Hromada je příliš velká."
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
-msgstr ""
+msgstr "Předmět patří někomu jinému."
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
-msgstr ""
+msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4115,29 +4226,29 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
-msgstr ""
+msgstr "Následování zrušeno."
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
-msgstr ""
+msgstr "Imitace zrušena."
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3832
 msgid "You see "
-msgstr ""
+msgstr "Vidíte "
 
 #: src/main.cpp:47
 msgid "manaplus [options] [mana-file]"
@@ -4233,7 +4344,7 @@ msgstr ""
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
-msgstr ""
+msgstr "Nemáte nic k prodeji."
 
 #: src/net/ea/buysellhandler.cpp:171
 msgid "Thanks for buying."
@@ -4241,35 +4352,35 @@ msgstr "Děkuji za nákup."
 
 #: src/net/ea/buysellhandler.cpp:179
 msgid "Unable to buy."
-msgstr ""
+msgstr "Nelze koupit."
 
 #: src/net/ea/charserverhandler.cpp:63
 msgid "Strength:"
-msgstr ""
+msgstr "Síla:"
 
 #: src/net/ea/charserverhandler.cpp:64
 msgid "Agility:"
-msgstr ""
+msgstr "Hbitost:"
 
 #: src/net/ea/charserverhandler.cpp:65
 msgid "Vitality:"
-msgstr ""
+msgstr "Vitalita:"
 
 #: src/net/ea/charserverhandler.cpp:66
 msgid "Intelligence:"
-msgstr ""
+msgstr "Inteligence:"
 
 #: src/net/ea/charserverhandler.cpp:67
 msgid "Dexterity:"
-msgstr ""
+msgstr "Obratnost:"
 
 #: src/net/ea/charserverhandler.cpp:68
 msgid "Luck:"
-msgstr ""
+msgstr "Štěstí:"
 
 #: src/net/ea/charserverhandler.cpp:102
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
+msgstr "Přístup zamítnut. Nejpravděpodobněji je na serveru příliš mnoho hráčů."
 
 #: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
@@ -4277,117 +4388,87 @@ msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:109
 msgid "Unknown char-server failure."
-msgstr ""
+msgstr "Neznámá chyba postavy na serveru."
 
 #: src/net/ea/charserverhandler.cpp:138
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
+"Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru "
+"existuje. "
 
 #: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
 msgid "Wrong name."
-msgstr ""
+msgstr "Špatné jméno."
 
 #: src/net/ea/charserverhandler.cpp:145
 msgid "Incorrect stats."
-msgstr ""
+msgstr "Nesprávné statistiky."
 
 #: src/net/ea/charserverhandler.cpp:148
 msgid "Incorrect hair."
-msgstr ""
+msgstr "Nesprávný účes."
 
 #: src/net/ea/charserverhandler.cpp:151
 msgid "Incorrect slot."
-msgstr ""
+msgstr "Nesprávný slot."
 
 #: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
-msgstr "Info"
+msgstr "informaceInfo"
 
 #: src/net/ea/charserverhandler.cpp:166
 msgid "Character deleted."
-msgstr ""
+msgstr "Postava odstraněna."
 
 #: src/net/ea/charserverhandler.cpp:172
 msgid "Failed to delete character."
-msgstr ""
+msgstr "Nepodařilo se odstranit postavu."
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
-msgstr ""
+msgstr "Kanály nejsou podporovány."
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr ""
+msgstr "Nelze odeslat šeptání, %s není připojen."
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr ""
+msgstr "Nelze odeslat šeptání, %s vás ignoruje."
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
 #, c-format
 msgid "Online users: %d"
-msgstr ""
+msgstr "připojených uživatel: %d"
 
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
 msgid "Game"
-msgstr ""
+msgstr "Hra"
 
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
-
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
-msgstr ""
+msgstr "Gilda vytvořena."
 
 #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr ""
+msgstr "Již jste členem gildy."
 
 #: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
@@ -4395,90 +4476,86 @@ msgstr ""
 
 #: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
-msgstr ""
+msgstr "Neznámá odpověď serveru."
 
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild name: %s"
-msgstr ""
+msgstr "Jméno gildy: %s"
 
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
 #, c-format
 msgid "Guild master: %s"
-msgstr ""
+msgstr "Vedoucí gildy: %s"
 
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Guild level: %d"
-msgstr ""
+msgstr "Úroveň gildy: %d"
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Online members: %d"
-msgstr ""
+msgstr "Připojených členů: %d"
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Average level: %d"
-msgstr ""
+msgstr "Průměrná úroveň: %d"
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
 #, c-format
 msgid "Guild exp: %d"
-msgstr ""
+msgstr "Zkušenosti gildy: %d"
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
 msgid "Could not inivte user to guild."
-msgstr ""
+msgstr "Nelze pozvat uživatele do gildy."
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
 msgid "User rejected guild invite."
-msgstr ""
+msgstr "Uživatel zamítl pozvánku do gildy."
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
 msgid "User is now part of your guild."
-msgstr ""
+msgstr "Uživatel je nyní členem vaší gildy."
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
 msgid "Your guild is full."
-msgstr ""
+msgstr "Vaše gilda je plná."
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
 msgid "Unknown guild invite response."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
+msgstr "Neznámá odpověď na pozváku do gildy."
 
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
 #, c-format
 msgid "%s has left your guild."
-msgstr ""
+msgstr "%s opustil vaši gildu."
 
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
 msgid "You was kicked from guild."
-msgstr ""
+msgstr "Byl jste vykopnut z gildy."
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr ""
+msgstr "%s byl vykopnut z vaší gildy."
 
 #: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
@@ -4554,78 +4631,78 @@ msgstr ""
 
 #: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
-msgstr ""
+msgstr "Sdílení předmětů povoleno."
 
 #: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
-msgstr ""
+msgstr "Sdílení předmětů zakázáno."
 
 #: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
-msgstr ""
+msgstr "Sdílení předmětů není možné."
 
 #: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr ""
+msgstr "Stav sdílení předmětů neznámý."
 
 #: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
-msgstr ""
+msgstr "Sdílení zkušeností povoleno."
 
 #: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
-msgstr ""
+msgstr "Sdílení zkušeností zakázáno."
 
 #: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
-msgstr ""
+msgstr "Sdílení zkušeností není možné."
 
 #: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr ""
+msgstr "Stav sdílení zkušeností neznámý."
 
 #: src/net/ea/inventoryhandler.cpp:407
 msgid "Failed to use item."
-msgstr ""
+msgstr "Pokus o použití předmětu selhal."
 
 #: src/net/ea/inventoryhandler.cpp:580
 msgid "Unable to equip."
-msgstr ""
+msgstr "Nelze vybavit."
 
 #: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
-msgstr ""
+msgstr "Účet nenalezen, prosím přihlaste se znovu."
 
 #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
-msgstr ""
+msgstr "Půvoní heslo je nesprávné."
 
 #: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr ""
+msgstr "Nové heslo je příliš krátké."
 
 #: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr ""
+msgstr "Neznámá chyba."
 
 #: src/net/ea/loginhandler.cpp:205
 msgid "Unregistered ID."
-msgstr ""
+msgstr "Neregistované ID."
 
 #: src/net/ea/loginhandler.cpp:208
 msgid "Wrong password."
-msgstr ""
+msgstr "Špatné heslo."
 
 #: src/net/ea/loginhandler.cpp:211
 msgid "Account expired."
-msgstr ""
+msgstr "Platnost účtu vypršela."
 
 #: src/net/ea/loginhandler.cpp:214
 msgid "Rejected from server."
-msgstr ""
+msgstr "Odmítnut ze serveru."
 
 #: src/net/ea/loginhandler.cpp:217
 msgid ""
@@ -4634,7 +4711,7 @@ msgstr ""
 
 #: src/net/ea/loginhandler.cpp:221
 msgid "Client too old."
-msgstr ""
+msgstr "Klient je příliš starý."
 
 #: src/net/ea/loginhandler.cpp:224
 #, c-format
@@ -4645,48 +4722,48 @@ msgstr ""
 
 #: src/net/ea/loginhandler.cpp:231
 msgid "Server overpopulated."
-msgstr ""
+msgstr "Server je přelidněný."
 
 #: src/net/ea/loginhandler.cpp:234
 msgid "This user name is already taken."
-msgstr ""
+msgstr "Toto uživatelské jméno je již používáno."
 
 #: src/net/ea/loginhandler.cpp:240
 msgid "Username permanently erased."
-msgstr ""
+msgstr "Uživatelské jméno bylo trvale odstraněno."
 
 #: src/net/ea/partyhandler.cpp:82
 msgid "Could not create party."
-msgstr ""
+msgstr "Nelze vytvořit partu."
 
 #: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
-msgstr ""
+msgstr "Parta úspěšně vytvořena."
 
 #: src/net/ea/partyhandler.cpp:140
 #, c-format
 msgid "%s has joined your party."
-msgstr ""
+msgstr "%s se připojil k vaší partě."
 
 #: src/net/ea/partyhandler.cpp:176
 #, c-format
 msgid "%s is already a member of a party."
-msgstr ""
+msgstr "%s je již členem vaší party."
 
 #: src/net/ea/partyhandler.cpp:181
 #, c-format
 msgid "%s refused your invitation."
-msgstr ""
+msgstr "%s zamítl vaši pozvánku."
 
 #: src/net/ea/partyhandler.cpp:186
 #, c-format
 msgid "%s is now a member of your party."
-msgstr ""
+msgstr "%s je nyní člen vaší party."
 
 #: src/net/ea/partyhandler.cpp:191
 #, c-format
 msgid "%s can't join your party because party is full."
-msgstr ""
+msgstr "%s nemůže být členem party, jelikož je parta plná."
 
 #: src/net/ea/partyhandler.cpp:196
 #, c-format
@@ -4695,185 +4772,190 @@ msgstr ""
 
 #: src/net/ea/partyhandler.cpp:356
 msgid "You have left the party."
-msgstr ""
+msgstr "Odešel jste z party."
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
 #, c-format
 msgid "%s has left your party."
-msgstr ""
+msgstr "%s opustil vaši partu."
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr ""
+msgstr "Neznámý člen se snažil říct: %s"
 
 #: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
-msgstr ""
+msgstr "Jste mrtev."
 
 #: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
+msgstr "S lítostí vám oznamujeme, že vaše postava byla zabita v bitvě."
 
 #: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
-msgstr ""
+msgstr "Nejste již více naživu."
 
 #: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
+msgstr "Chladné ruce smrti se natahují po vaší duši."
 
 #: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
-msgstr ""
+msgstr "Konec hry!"
 
 #: src/net/ea/playerhandler.cpp:101
 msgid "Insert coin to continue."
-msgstr ""
+msgstr "Vložte minci pro pokračování."
 
 #: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
+"Ne, děti. Vaše postava ve skutečnosti neumřela. Ona.. errm.. odešla na lepší "
+"místo."
 
 #: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
-msgstr ""
+msgstr "Váš plán zničit nepříteli zbraň pomocí úderů vlastním krkem selhal."
 
 #: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
-msgstr ""
+msgstr "Tuším že to nešlo tak hladce."
 
 #: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
-msgstr ""
+msgstr "Chcete zaevidovat váš majetek?"
 
 #: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
-msgstr ""
+msgstr "Žel, nezbyla po vás ani stopa..."
 
 #: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
-msgstr ""
+msgstr "Zničen."
 
 #: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
-msgstr ""
+msgstr "Vypadá to, že vám někdo podává vaši hlavu."
 
 #: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
+"Zase jste to podělal. Spláchněte vaše tělo do záchodu a najdete si nějaké "
+"jiné."
 
 #: src/net/ea/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
-msgstr ""
+msgstr "Ještě nejste mrtev. Zatím jen odpočíváte."
 
 #: src/net/ea/playerhandler.cpp:120
 msgid "You are no more."
-msgstr ""
+msgstr "Již nejste."
 
 #: src/net/ea/playerhandler.cpp:121
 msgid "You have ceased to be."
-msgstr ""
+msgstr "Bylo vám odepřeno být."
 
 #: src/net/ea/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
-msgstr ""
+msgstr "Expiroval jste a šel jste navštívit svého tvůrce."
 
 #: src/net/ea/playerhandler.cpp:123
 msgid "You're a stiff."
-msgstr ""
+msgstr "Jste tuhý."
 
 #: src/net/ea/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
-msgstr ""
+msgstr "Jste zbaven života, odpočívejte v pokoji."
 
 #: src/net/ea/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
+msgstr "Kdybyste nebyl tak animovaný, čuchal by jste ke květinkám zespoda."
 
 #: src/net/ea/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
-msgstr ""
+msgstr "vaše metabolické procesy jsou nyní historií."
 
 #: src/net/ea/playerhandler.cpp:127
 msgid "You're off the twig."
-msgstr ""
+msgstr "Padl jste."
 
 #: src/net/ea/playerhandler.cpp:128
 msgid "You've kicked the bucket."
-msgstr ""
+msgstr "A je to v kýblu."
 
 #: src/net/ea/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
+"Vaše trápení je u konce, opona je stažená a vy jste se připojil k vašemu "
+"neviditelnému sboru."
 
 #: src/net/ea/playerhandler.cpp:131
 msgid "You are an ex-player."
-msgstr ""
+msgstr "nyní jste bývalý hráč."
 
 #: src/net/ea/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
-msgstr ""
+msgstr "Zpráva"
 
 #: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr "Nesete více než polovinu vaší váhy. Obnovování života nyní není možné."
 
 #: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
+msgstr "Nesete méně než polovinu vaší váhy. Obnovování života je nyní možné."
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
 #, c-format
 msgid "You picked up %s."
-msgstr ""
+msgstr "Sebral jste %s."
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
 #, c-format
 msgid "You spent %s."
-msgstr ""
+msgstr "utratil jste %s."
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
 msgid "Cannot raise skill!"
-msgstr ""
+msgstr "Nelze zlepšit tuto dovednost!"
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
 msgid "Equip arrows first."
-msgstr ""
+msgstr "nejdřív se vybavte šípy."
 
 #: src/net/ea/specialhandler.cpp:149
 msgid "Trade failed!"
-msgstr ""
+msgstr "Obchod selhal!"
 
 #: src/net/ea/specialhandler.cpp:152
 msgid "Emote failed!"
-msgstr ""
+msgstr "Smajlík selhal!"
 
 #: src/net/ea/specialhandler.cpp:155
 msgid "Sit failed!"
-msgstr ""
+msgstr "Sednutí selhalo!"
 
 #: src/net/ea/specialhandler.cpp:158
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "Selhalo vytváčení postavy!"
 
 #: src/net/ea/specialhandler.cpp:161
 msgid "Could not join party!"
-msgstr ""
+msgstr "Nemůžete vstoupit do party!"
 
 #: src/net/ea/specialhandler.cpp:164
 msgid "Cannot shout!"
@@ -4881,15 +4963,15 @@ msgstr ""
 
 #: src/net/ea/specialhandler.cpp:177
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "Nedosáhl jste ještě dostatečně vysoké úrovně!"
 
 #: src/net/ea/specialhandler.cpp:181
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "Nedostatek životů (HP)!"
 
 #: src/net/ea/specialhandler.cpp:184
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "Nedostatek many (SP)!"
 
 #: src/net/ea/specialhandler.cpp:187
 msgid "You have no memos!"
@@ -4897,15 +4979,15 @@ msgstr ""
 
 #: src/net/ea/specialhandler.cpp:190
 msgid "You cannot do that right now!"
-msgstr ""
+msgstr "Nyní toto nelze!"
 
 #: src/net/ea/specialhandler.cpp:193
 msgid "Seems you need more money... ;-)"
-msgstr ""
+msgstr "Vypadá to že potřebujete více peněz... ;-)"
 
 #: src/net/ea/specialhandler.cpp:196
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
+msgstr "Nemůžete použít tuto dovednost s touto zbraní!"
 
 #: src/net/ea/specialhandler.cpp:200
 msgid "You need another red gem!"
@@ -4990,7 +5072,7 @@ msgstr ""
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
 msgid "Strength"
 msgstr "Síla"
 
@@ -4999,7 +5081,7 @@ msgstr "Síla"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
 msgid "Agility"
 msgstr "Hbitost"
 
@@ -5008,7 +5090,7 @@ msgstr "Hbitost"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
 msgid "Dexterity"
 msgstr "Obratnost"
 
@@ -5017,7 +5099,7 @@ msgstr "Obratnost"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
 msgid "Vitality"
 msgstr "Vitalita"
 
@@ -5026,7 +5108,7 @@ msgstr "Vitalita"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
 msgid "Intelligence"
 msgstr "Inteligence"
 
@@ -5296,111 +5378,115 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
 msgid "Luck"
 msgstr "Štěstí"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
 msgid "Attack Range"
 msgstr ""
 
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
 #: src/net/tmwa/network.cpp:152
 msgid "Empty address given to Network::connect()!"
 msgstr ""
@@ -5418,49 +5504,47 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "Attack %+d"
 msgstr "Útok %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "Defense %+d"
 msgstr "Obrana %+d"
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Neznámý předmět"
-
-
diff --git a/po/de.po b/po/de.po
index 739266db9..eba613f93 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,17 +2,18 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 #
-#   <der.loisl@gmx.de>, 2011.
+# Translators:
+# Andrei Karas <akaras@inbox.ru>, 2011.
 #   <clos3rlook@gmail.com>, 2011.
+#   <der.loisl@gmx.de>, 2011.
 #   <jack@krass.com>, 2011.
 #   <Necromong@inbox.ru>, 2011.
-# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
-"PO-Revision-Date: 2011-09-02 15:29+0000\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-16 20:11+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
 "de/)\n"
@@ -22,57 +23,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Video"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr "Spielfiguren werden angefragt"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -82,64 +95,64 @@ msgstr "Charakterserver wechseln"
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "Passwort ändern"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, 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:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: %s"
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 "Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..."
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -148,152 +161,152 @@ msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
 "oder du bist es selbst."
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Anfrage den Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr "Name der Gilde fehlt."
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)"
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "Nachricht schließt den Chat."
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "Enter aktiviert jetzt den Chat."
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "Nachricht schließt jetzt den Chat."
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "Freund"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "unbeachtet"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "Spieler ist bereits %s!"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spieler erfolgreich %s!"
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spieler konnte nicht %s werden!"
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "Spieler ist bereits gelöscht!"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr "Spieler erfolgreich gelöscht!"
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr "Spieler konnte nicht gelöscht werden!"
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -311,15 +324,15 @@ msgstr "Allgemein"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr "Bildschirmfoto gespeichert unter"
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
@@ -327,19 +340,19 @@ msgstr "Die Verbindung zum Server wurde getrennt."
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden."
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -373,18 +386,19 @@ msgid "Name"
 msgstr "Name"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Angriff"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Sprechen"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "Bewegen"
 
@@ -397,8 +411,8 @@ msgid "Reset"
 msgstr "Zurücksetzten"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -425,7 +439,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -442,8 +456,8 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Laden"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -452,16 +466,16 @@ msgstr "Verkaufen"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -736,10 +750,10 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "ignorieren"
 
@@ -885,7 +899,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Schließen"
 
@@ -902,7 +916,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -912,8 +926,8 @@ msgstr "Ausrüstung"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -922,18 +936,16 @@ msgid "Help"
 msgstr "Hilfe"
 
 #: src/gui/inventorywindow.cpp:71
-#, fuzzy
 msgid "by name"
-msgstr "Umbenennen"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:73
-#, fuzzy
 msgid "by weight"
-msgstr "Gewicht:"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
@@ -961,31 +973,31 @@ msgid "Sort:"
 msgstr "Sortieren:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Benutzen"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Aufteilen"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "Ausrüstung"
 
@@ -994,17 +1006,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Aufbewahren"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -1058,91 +1070,91 @@ msgstr "Gewicht: %s"
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "Statistik zurücksetzen"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "Timer zurücksetzen"
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr "Du hast die Guilde verlassen."
 
@@ -1244,7 +1256,7 @@ msgstr "Absenden"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "Frei"
 
@@ -1282,328 +1294,329 @@ msgstr "Zuerst ausziehen"
 msgid "Away outfit"
 msgstr "Abwesend-Outfit"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handeln"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr "Flüstern"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr "Heilen"
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr "Befreunden"
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr "Folgen"
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr "Aufheben"
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Zaubersprüche"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "Hervorhebung abschalten"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "Hervorhebung einschalten"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr "Verlassen"
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr "Name:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "Die Hälfte aufbewahren"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "Die Hälfte abholen"
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Server wechseln"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Spielfigur wechseln"
 
@@ -2007,9 +2020,8 @@ msgid "Draw hotkeys on map"
 msgstr "Zeige Hotekeys auf der Karte"
 
 #: src/gui/setup_other.cpp:87
-#, fuzzy
 msgid "Enable lazy scrolling"
-msgstr "Aufzeichnen des Chats einschalten"
+msgstr ""
 
 #: src/gui/setup_other.cpp:90
 msgid "Scroll laziness"
@@ -2131,10 +2143,6 @@ msgstr ""
 msgid "Show background"
 msgstr "Zeige Hintergrund"
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
@@ -2423,10 +2431,6 @@ msgstr "FPS Limit:"
 msgid "Alt FPS limit: "
 msgstr "Alt FPS Limit:"
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Video"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Chat über Spielern"
@@ -2774,243 +2778,243 @@ msgstr "Name deiner Party wählen."
 msgid "Specials"
 msgstr "Special"
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -4187,68 +4191,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr "Folgen:"
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr "Du siehst"
 
@@ -5508,19 +5512,19 @@ msgstr "Verbindung mit Server abgebrochen. "
 msgid "%s is not in your party!"
 msgstr "%s ist nicht in Deiner Party!"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr "Drucke '..'"
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr "Blinkender Name"
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr "Schwebende '...' Blase"
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr "Schwebende Blase"
 
diff --git a/po/es.po b/po/es.po
index 7f98a9e97..7fb91889d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
-"PO-Revision-Date: 2011-09-09 22:37+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-17 04:30+0000\n"
+"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/es/)\n"
 "Language: es\n"
@@ -23,57 +23,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Rendimiento"
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr "Temas"
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -83,63 +95,63 @@ msgstr "Cambiando servidores del juego"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, 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:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, 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:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Comando desconocido."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "¡No puedes enviar susurros vacíos!"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -148,152 +160,152 @@ msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando la entrada del canal %s."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
-msgstr "Falta el nombre del gremio."
+msgstr "Falta el nombre del Clan."
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "Mensaje cierra la charla."
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "desatendido"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya es %s!"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Jugador %s exitosamente!"
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estaba ignorado!"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr "¡Jugador borrado con éxito!"
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr "tamaño de caché de fuente"
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr "Tám. caché:"
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr "Creado:"
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr "Borrado:"
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
@@ -311,15 +323,15 @@ msgstr "General"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
@@ -327,19 +339,19 @@ msgstr "Se ha perdido la conexión con el servidor."
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -352,7 +364,7 @@ msgstr "Grupo: %s"
 #: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
-msgstr "Gremio: %s"
+msgstr "Clan: %s"
 
 #: src/gui/beingpopup.cpp:151
 #, c-format
@@ -373,18 +385,19 @@ msgid "Name"
 msgstr "Nombre"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Hablar"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "Mover"
 
@@ -397,8 +410,8 @@ msgid "Reset"
 msgstr "Restablecer"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Comprar"
 
@@ -425,7 +438,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -442,8 +455,8 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Tienda"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -452,16 +465,16 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -736,10 +749,10 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -842,7 +855,7 @@ msgstr "Grupo de destino:"
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
 #: src/gui/debugwindow.cpp:349
 msgid "Target Guild:"
-msgstr "Diana de Guild:"
+msgstr "Target Guild:"
 
 #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
 #: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
@@ -885,7 +898,7 @@ msgstr "¿Sabías que...?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Cerrar"
 
@@ -902,7 +915,7 @@ msgid "Auto open this window"
 msgstr "Abrir automáticamente esta ventana"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -912,8 +925,8 @@ msgstr "Equipamiento"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -923,23 +936,23 @@ msgstr "Ayuda"
 
 #: src/gui/inventorywindow.cpp:71
 msgid "by name"
-msgstr ""
+msgstr "por nombre"
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
-msgstr ""
+msgstr "por id"
 
 #: src/gui/inventorywindow.cpp:73
 msgid "by weight"
-msgstr ""
+msgstr "por peso"
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
-msgstr ""
+msgstr "por cantidad"
 
 #: src/gui/inventorywindow.cpp:75
 msgid "by type"
-msgstr ""
+msgstr "por tipo"
 
 #: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
@@ -959,31 +972,31 @@ msgid "Sort:"
 msgstr "Ordenar:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "Conjuntos"
 
@@ -992,17 +1005,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Tirar"
@@ -1056,93 +1069,93 @@ msgstr "Peso: %s"
 msgid "Kill stats"
 msgstr "Estadísticas"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "Restablecer estadísticas"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "Restablecer cronometrador"
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nivel: %d de %f%%"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d/%d Queda: %d"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, prom. pandilla para 1%%: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Muertes: %s, exp. total: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Prom. Exp: %s, Prom. de pandilla para siguiente nivel: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Matanza/Mín: %s, Exp/Mín: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rapidez de experiencia por %d minuto: %s"
 msgstr[1] "Rapidez de experiencia por %d minutos: %s"
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tiempo para el siguiente nivel por %d minuto: %s"
 msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s"
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr "Exp de último monstruo eliminado:"
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr "Tiempo antes de que jacko desove:"
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tiempo para el siguiente nivel: %s"
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr "¿%s %d?"
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr "desove de jacko"
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
-msgstr "Has dejado el gremio."
+msgstr "Has dejado el clan."
 
 #: src/gui/logindialog.cpp:59
 msgid "Normal"
@@ -1242,7 +1255,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -1280,328 +1293,329 @@ msgstr "Quitárselo antes"
 msgid "Away outfit"
 msgstr "Conjunto para modo AFK"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Intercambio"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr "Sanar"
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr "Ser amigo"
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr "Desatender"
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr "Borrar"
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr "Des-ignorar"
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr "Imitación"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr "Invitar a grupo"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr "Sacar del grupo"
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
-msgstr "Sacar del gremio"
+msgstr "Sacar del clan"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
-msgstr "Cambiar posición en el gremio"
+msgstr "Cambiar posición en el clan"
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
-msgstr "Invitar al gremio"
+msgstr "Invitar al clan"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr "Sacar jugador"
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr "Eliminar"
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr "Mostrar artículos"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr "Desvestir"
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr "Agregar comentario"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr "Sacar"
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritaria"
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr "Recoger"
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr "Deformar"
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr "Cargar conjuntos antiguos"
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Hechizos"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr "Cargar hechizos antiguos"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr "No remover nombre"
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr "Remover nombre"
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr "Dejar"
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
-msgstr "Cambiar posición del gremio"
+msgstr "Cambiar posición del Clan"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr "Nombre:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr "Comentario del jugador            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr "Comentario:                      "
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr "Agredar al intercambio"
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr "Tirar todo"
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr "Cargar atajos antiguos de artículos"
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr "Cargar atajos antiguos de soltar (drop)"
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(predeterminado)"
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr "Subir"
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr "Bajar"
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Cambiar de servidor"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Cambiar de personaje"
 
@@ -1717,7 +1731,7 @@ msgstr "Habilitar música"
 
 #: src/gui/setup_audio.cpp:54
 msgid "Enable mumble voice chat"
-msgstr "Habilitar el chat de voz entre dientes"
+msgstr "Habilitar el chat de voz de mumble"
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
@@ -2006,15 +2020,15 @@ msgstr "Dibujar teclas de acceso rápido en el mapa"
 
 #: src/gui/setup_other.cpp:87
 msgid "Enable lazy scrolling"
-msgstr ""
+msgstr "Habilitar desplazamiento perezoso"
 
 #: src/gui/setup_other.cpp:90
 msgid "Scroll laziness"
-msgstr ""
+msgstr "Pereza al desplazarse"
 
 #: src/gui/setup_other.cpp:93
 msgid "Scroll radius"
-msgstr ""
+msgstr "Radio de desplazamiento"
 
 #: src/gui/setup_other.cpp:97
 msgid "Moving"
@@ -2128,10 +2142,6 @@ msgstr "Ocultar los objetos escudos"
 msgid "Show background"
 msgstr "Mostrar fondo"
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr "Rendimiento"
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Mejor rendimiento (permite obtener un mejor rendimiento)"
@@ -2420,10 +2430,6 @@ msgstr "Límite FPS:"
 msgid "Alt FPS limit: "
 msgstr "Límite FPS alternativo: "
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Vídeo"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Sobrecarga de texto"
@@ -2579,7 +2585,7 @@ msgstr "Clan"
 #: src/gui/socialwindow.cpp:147
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr "Invita al jugador %s para su clan %s."
+msgstr "Invita al jugador %s al clan %s."
 
 #: src/gui/socialwindow.cpp:161
 #, c-format
@@ -2597,12 +2603,12 @@ msgstr "A quién te gustaría invitar al clan %s?"
 
 #: src/gui/socialwindow.cpp:198
 msgid "Leave Guild?"
-msgstr "Salir del clan?"
+msgstr "¿Dejar el clan?"
 
 #: src/gui/socialwindow.cpp:199
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Estás seguro de dejar el clan %s?"
+msgstr "¿Estás seguro de dejar el clan %s?"
 
 #: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
@@ -2658,7 +2664,7 @@ msgstr "Ignorar pandillas"
 
 #: src/gui/socialwindow.cpp:1074
 msgid "Create Guild"
-msgstr "Crear clan"
+msgstr "Crear Clan"
 
 #: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
 msgid "Create Party"
@@ -2685,12 +2691,12 @@ msgstr "Cancelada la invitación de %s."
 #: src/gui/socialwindow.cpp:1313
 #, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Aceptada la invitación a la guild de  %s."
+msgstr "Aceptada la invitación al clan de  %s."
 
 #: src/gui/socialwindow.cpp:1326
 #, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Cancelada la invitación a la guild de %s."
+msgstr "Rechazada la invitación al clan de %s."
 
 #: src/gui/socialwindow.cpp:1373
 #, c-format
@@ -2766,243 +2772,243 @@ msgstr "Escoja el nombre del grupo."
 msgid "Specials"
 msgstr "Especiales"
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) moverse predeterminado"
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) moverse invertido"
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos locos"
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos locos"
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) maniobra"
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) maniobra alocada personalizada"
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) maniobra loca"
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse al objetivo en distancia 1"
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) desplazarse al objetivo en el rango de ataque"
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) mover al objetivo"
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) seguimiento como mascota"
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) seguimiento desconoicido"
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) ataque predeterminado"
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S)  intercambiar ataque con escudo"
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) atacar"
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger interesadamente a 2x3 celda"
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger a 3x3 celdas"
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) vista depurar del mapa"
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) ultra vista del mapa"
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra vista del mapa 2"
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) vista vacía del mapa"
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) vista del mapa"
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de conjuntos"
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) afuera"
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) Definir el modo operativo de la cámara"
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
@@ -3393,7 +3399,7 @@ msgstr "Miembros del grupo"
 
 #: src/gui/userpalette.cpp:130
 msgid "Guild Members"
-msgstr "Miembros del guild"
+msgstr "Miembros del Clan"
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3642,7 +3648,7 @@ msgstr "/invite > Invita un jugador a tu clan"
 
 #: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Deja el clan en la que estas"
+msgstr "/leave > Deja el clan en el que estas"
 
 #: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/kick > Kick some one from the guild you are in"
@@ -4181,68 +4187,68 @@ msgstr ""
 "Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
 msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr "Ves "
 
@@ -4462,7 +4468,7 @@ msgstr "Clan creado."
 
 #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr "Ya estás en el gremio."
+msgstr "Ya estás en el clan."
 
 #: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
@@ -4475,17 +4481,17 @@ msgstr "Respuesta del servidor desconocida."
 #: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild name: %s"
-msgstr "Nombre del gremio: %s"
+msgstr "Nombre del clan: %s"
 
 #: src/net/ea/guildhandler.cpp:183
 #, c-format
 msgid "Guild master: %s"
-msgstr "Maestro del gremio: %s"
+msgstr "Maestro del clan: %s"
 
 #: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Guild level: %d"
-msgstr "Nivel en gremio: %d"
+msgstr "Nivel en el clan: %d"
 
 #: src/net/ea/guildhandler.cpp:187
 #, c-format
@@ -4505,17 +4511,17 @@ msgstr "Nivel promedio: %d"
 #: src/net/ea/guildhandler.cpp:193
 #, c-format
 msgid "Guild exp: %d"
-msgstr "Experiencia del gremio: %d"
+msgstr "Experiencia del clan: %d"
 
 #: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild next exp: %d"
-msgstr "Experiencia siguiente del gremio: %d"
+msgstr "Experiencia siguiente del clan: %d"
 
 #: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild castle: %s"
-msgstr "Castillo del gremio: %s"
+msgstr "Castillo del clan: %s"
 
 #: src/net/ea/guildhandler.cpp:403
 msgid "Could not inivte user to guild."
@@ -4523,7 +4529,7 @@ msgstr "No se puede invitar jugadores al clan."
 
 #: src/net/ea/guildhandler.cpp:407
 msgid "User rejected guild invite."
-msgstr "El jugador cancel la invitacion a tu guild."
+msgstr "El jugador ha rechazado la invitación al clan."
 
 #: src/net/ea/guildhandler.cpp:411
 msgid "User is now part of your guild."
@@ -4535,21 +4541,21 @@ msgstr "Tu clan está lleno."
 
 #: src/net/ea/guildhandler.cpp:419
 msgid "Unknown guild invite response."
-msgstr "Invitación desconocida a una guild."
+msgstr "Invitación desconocida a un clan."
 
 #: src/net/ea/guildhandler.cpp:453
 #, c-format
 msgid "%s has left your guild."
-msgstr "%s ha dejado tu gremio."
+msgstr "%s ha dejado tu clan."
 
 #: src/net/ea/guildhandler.cpp:484
 msgid "You was kicked from guild."
-msgstr "Usted fue expulsado del gremio."
+msgstr "Usted fue expulsado del clan."
 
 #: src/net/ea/guildhandler.cpp:497
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s saco alguien de tu gremio."
+msgstr "%s saco alguien de tu clan."
 
 #: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
@@ -5518,19 +5524,19 @@ msgstr "Conexión al servidor terminada."
 msgid "%s is not in your party!"
 msgstr "%s no está en tu grupo!"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr "Parpadear nombre"
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr "Burbuja '...' flotante"
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr "Burbuja Flotante"
 
diff --git a/po/fi.po b/po/fi.po
index 78f41e550..6a2de694a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
-"PO-Revision-Date: 2011-09-09 22:37+0000\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-16 20:12+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
@@ -19,57 +19,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Kuva"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -79,63 +91,63 @@ msgstr "Vaihdan pelipalvelinta"
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/client.cpp:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -144,152 +156,152 @@ msgstr ""
 "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
 "käytit omaa nimeäsi."
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Pyyntö liittyä kanavalle %s lähetetty."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr "Killan nimi puuttuu."
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "Viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "Nyt viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "ystävä"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "vaimennettu"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "neutraali"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "Pelaaja on jo %s!"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pelaaja on nyt %s."
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "Pelaaja huomioidaan taas."
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "Pelaaja on jo pyyhitty!"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr "Pelaaja pyyhitty."
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d viikon"
 msgstr[1] "%d viikkoa"
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivän"
 msgstr[1] "%d päivää"
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunnin"
 msgstr[1] "%d tuntia"
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutin"
 msgstr[1] "%d minuuttia"
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunnin"
 msgstr[1] "%d sekuntia"
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr "kirjasinvälimuistin koko"
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr "Välimuistin koko:"
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr "Luotu:"
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr "Poistettu:"
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
@@ -308,15 +320,15 @@ msgstr "Yleiset"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
@@ -324,19 +336,19 @@ msgstr "Yhteys palvelimeen katkesi."
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -370,18 +382,19 @@ msgid "Name"
 msgstr "Nimi"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Hyökkää"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Keskustele"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "Liiku"
 
@@ -394,8 +407,8 @@ msgid "Reset"
 msgstr "Nollaa"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Osta"
 
@@ -422,7 +435,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -439,8 +452,8 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Kauppa"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -449,16 +462,16 @@ msgstr "Myy"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -733,10 +746,10 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "Ohita"
 
@@ -882,7 +895,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Sulje"
 
@@ -899,7 +912,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -909,8 +922,8 @@ msgstr "Varusteet"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
@@ -956,31 +969,31 @@ msgid "Sort:"
 msgstr "Järj.:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Ota käyttöön"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Käytä"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "Pudota..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Jaa"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
 
@@ -989,17 +1002,17 @@ msgid "Weight:"
 msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Varastoi"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Pudota"
@@ -1053,91 +1066,91 @@ msgstr "Paino: %s"
 msgid "Kill stats"
 msgstr "Tappotilastot"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "Nollaa tiedot"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "Nollaa ajastin"
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr "Olet eronnut killasta."
 
@@ -1239,7 +1252,7 @@ msgstr "Lähetä"
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -1277,328 +1290,329 @@ msgstr "Riisu ensin"
 msgid "Away outfit"
 msgstr "Poissaoloasu"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Tee kaupat"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr "Kuiskaa"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr "Paranna"
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr "Ystävysty"
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr "Vaimenna"
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr "Pyyhi"
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr "Seuraa"
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr "Matki"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr "Potki pelaaja"
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr "Pommita"
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr "Riisu"
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr "Potki"
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr "Poista hyökkäyslistasta"
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr "Lisää prioriteettihyökkäyslistalle"
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr "Nosta"
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr "Karttaolio"
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr "Poista"
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr "Lataa vanhat asut"
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Loitsut"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr "Lataa vanhat loitsut"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr "Poista nimi"
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr "Eroa"
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "Varastoi 10"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "Varastoi puolet"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr "Lataa vanhat tavarapikavalinnat"
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr "Lataa vanhat pudotuspikavalinnat"
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr "Piilota"
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr "Näytä"
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(oletus)"
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr "Siirrä ylös"
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr "Siirrä alas"
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Vaihda palvelinta"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Vaihda hahmoa"
 
@@ -2125,10 +2139,6 @@ msgstr "Piilota kilpihahmo"
 msgid "Show background"
 msgstr "Näytä tausta"
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
@@ -2417,10 +2427,6 @@ msgstr "Piirtonopeusrajoitin (FPS):"
 msgid "Alt FPS limit: "
 msgstr "Vaihtoehtoinen FPS-rajoitin:"
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Kuva"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Tekstinä yläpuolella"
@@ -2761,243 +2767,243 @@ msgstr "Anna ryhmällesi nimi."
 msgid "Specials"
 msgstr "Erikoisuudet"
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) liiku"
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) mene, hyökkää, nosta"
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pieni nosto 1x1 ruutua"
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) oletusnosto 2x1 ruutua"
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) nosto edestä 2x3 ruutua"
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) nosto 3x3 ruutua"
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) mene ja nosta etäisyydellä 4"
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) mene ja nosta etäisyydellä 8"
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) mene ja nosta maksimietäisyydellä"
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) nosta"
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) tyhjä karttanäkymä"
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) karttanäkymä"
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) poissa"
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) suunnittelukamera"
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
@@ -4175,68 +4181,68 @@ msgstr ""
 "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
 "ole hyvä ja poista päällekkäisyydet. "
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr "Sinut otti hengiltä "
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit nostaa olemattoman tavaran."
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran nostamisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr "Näet "
 
@@ -5506,19 +5512,19 @@ msgstr "Yhteys palvelimeen katkaistu. "
 msgid "%s is not in your party!"
 msgstr "%s ei ole ryhmässäsi!"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr "Tulosta '...'"
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr "Vilkuta nimeä"
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr "Leijuva '...' -puhekupla"
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr "Leijuva puhekupla"
 
diff --git a/po/fr.po b/po/fr.po
index 3ec205a5f..29fc8a192 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
-"PO-Revision-Date: 2011-09-09 22:37+0000\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-16 20:11+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
 "fr/)\n"
@@ -22,57 +22,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "esquivé"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Vidéo"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -82,64 +94,64 @@ msgstr "Changement de serveur de jeu"
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/client.cpp:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, 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éé ! Fermeture du programme."
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer de messages vides."
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -148,153 +160,153 @@ msgstr ""
 "Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
 "\". Soit elle existe déjà, soit il s'agit de vous même."
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Demande de rejoindre le canal %s."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr "Le nom de la guilde est manquant."
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "Veuillez indiquer un nom."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "Le message ferme la conversation."
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr ""
 "La touche <entrée> ferme maintenant la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "Le message ferme maintenant la conversation."
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "ami"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "écarté"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "neutre"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur  %s avec succès!"
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr "Joueur éliminé avec succès !"
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr "le joueur n'a pas pu être effacé !"
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d secondes"
 msgstr[1] "%d secondes"
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr "Taille du cache de polices"
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr "Dimension du cache :"
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr "Créé : "
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr "Effacé :"
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
@@ -312,15 +324,15 @@ msgstr "Général"
 msgid "Debug"
 msgstr "Informations"
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
@@ -329,19 +341,19 @@ msgstr ""
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -375,18 +387,19 @@ msgid "Name"
 msgstr "Nom"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Attaquer"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Parler"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "Déplacement"
 
@@ -399,8 +412,8 @@ msgid "Reset"
 msgstr "Réinitialiser"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Acheter"
 
@@ -427,7 +440,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -444,8 +457,8 @@ msgstr "Max."
 msgid "Shop"
 msgstr "Boutique"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -454,16 +467,16 @@ msgstr "Vendre"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -738,10 +751,10 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -887,7 +900,7 @@ msgstr "Le saviez-vous ?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Fermer"
 
@@ -904,7 +917,7 @@ msgid "Auto open this window"
 msgstr "Ouverture automatique de cette fenêtre"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -914,8 +927,8 @@ msgstr "Équipement"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -961,31 +974,31 @@ msgid "Sort:"
 msgstr "Tri :"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Équiper"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Utiliser"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "Jeter..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Partager"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "Tenues"
 
@@ -994,17 +1007,17 @@ msgid "Weight:"
 msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Jeter"
@@ -1058,91 +1071,91 @@ msgstr "Poids : %s"
 msgid "Kill stats"
 msgstr "Statistiques"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "RaZ stats"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "RaZ temps"
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Niveau : %d à %f%%"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp : %d/%d Reste : %d"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d Moyenne des monstres tués 1%% : %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Nbre Tués : %s, total exp : %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Moyenne Exp: %s, Nombre de monstres pour le prochain niveau : %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Tués/Min : %s, Exp/Min : %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rapidité exp pour %d min : %s"
 msgstr[1] "Rapidité exp pour %d min : %s"
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Temps pour le prochain niveau %d min : %s"
 msgstr[1] "Temps pour le prochain niveau %d min : %s"
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr "Exp du dernier tué :"
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr "Temps avant l'arrivée de Jack0 :"
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Temps pour le prochain niveau : %s"
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr "Arrivée de Jack0"
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr "vous avez quitté la guilde."
 
@@ -1244,7 +1257,7 @@ msgstr "Soumettre"
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "Effacer"
 
@@ -1282,328 +1295,329 @@ msgstr "Retirer d'abord l'équipement"
 msgid "Away outfit"
 msgstr "Équipement en absence"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Échange"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr "Message"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr "Soigner"
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr "Être ami"
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr "Éviter"
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr "Éliminer"
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr "Suivre"
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr "Imiter"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr "Sortir du groupe"
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr "Sortir de la guilde"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr "Sortir le joueur"
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr "Annihiler"
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr "Montrer les objets"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr "Déshabiller"
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr "Virer"
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr "Enlever de la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr "Ajouter à la liste de priorités d'attaque"
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la boite de dialogue"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr "Ramasser"
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr "Objet de carte"
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr "Charger les anciennes tenues"
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Sortilèges"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr "Charger les anciens sorts"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr "Éditer le sortilège"
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr "Enlève le nom"
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr "Quitter"
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr "Changer la position de la Guilde"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr "Nom : "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr "Le joueur commente            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr "Commentaire :                      "
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "Entreposer 10"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "Entreposer tout"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr "Jeter tout"
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr "Charger les anciens raccourcis d'objets"
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr "Charger les anciens raccourcis de jets d'objets"
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr "Cacher"
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr "Montrer"
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(défaut)"
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr "Aller vers le haut"
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr "Aller vers le bas"
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Changer de serveur"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Changer de personnage"
 
@@ -2129,10 +2143,6 @@ msgstr "Cacher le bouclier"
 msgid "Show background"
 msgstr "Montrer le fond"
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
@@ -2421,10 +2431,6 @@ msgstr "Limite FPS :"
 msgid "Alt FPS limit: "
 msgstr "Alterner les limites FPS"
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Vidéo"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Texte aérien"
@@ -2776,243 +2782,243 @@ msgstr "Choisissez le nom du groupe."
 msgid "Specials"
 msgstr "Cpt. spéciales"
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Mouvements un peu fous"
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) Mouvement complètement fous"
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) Mouvements"
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) Mouvements fous personnalisés"
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) Mouvements fous"
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Aller à la cible en distante de 1"
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3)  Aller à la cible en distante de 3"
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5)  Aller à la cible en distante de 5"
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Aller à la cible en distante de 7"
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) Aller à la cible"
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un toutou"
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) Suivre : mode inconnu"
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) Attaquer sans protection"
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) Attaquer avec protection"
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) Attaque"
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) Ramassage"
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) Vue de la carte vide"
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) Carte"
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) Sorts d'attaque"
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) Absent"
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) Absent"
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) Définir le mode camera"
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
@@ -4195,68 +4201,68 @@ msgstr ""
 "Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
 "touches ou attendez vous à un possible comportement étrange du jeu."
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr "Vous avez été tué par "
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
 msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr "Vous voyez  "
 
@@ -5556,19 +5562,19 @@ msgstr "Connexion au serveur terminée."
 msgid "%s is not in your party!"
 msgstr "%s n'est pas membre de votre groupe !"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr "Affiche '...'"
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr "Fais clignoter le nom"
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr "Bulle flottante '...'"
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr "Bulle flottante"
 
diff --git a/po/hr.po b/po/hr.po
index cdcf9c1d2..9b536203a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,57 +18,69 @@ msgstr ""
 "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/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Slika"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -78,63 +90,63 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Nepoznata naredba."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "Ne mogu poslati prazan šapate!"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -143,97 +155,97 @@ msgstr ""
 "Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to "
 "vi."
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Zahtjev za pridruživanje kanalu %s."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Ime partije nedostaje."
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "Poruka zatvara chat."
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara chat."
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -241,7 +253,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -249,7 +261,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -257,7 +269,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -265,7 +277,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -273,27 +285,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -310,15 +322,15 @@ msgstr "Općenito"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr ""
 
@@ -326,19 +338,19 @@ msgstr ""
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
@@ -372,18 +384,19 @@ msgid "Name"
 msgstr "Ime"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Napad"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Govori"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr ""
 
@@ -396,8 +409,8 @@ msgid "Reset"
 msgstr "Poništi"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Kupi"
 
@@ -424,7 +437,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -441,8 +454,8 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Trgovina"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -451,16 +464,16 @@ msgstr "Prodaj"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -735,10 +748,10 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr ""
 
@@ -884,7 +897,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Zatvori"
 
@@ -901,7 +914,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "U redu"
 
@@ -911,8 +924,8 @@ msgstr "Oprema"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Skini opremu"
 
@@ -960,31 +973,31 @@ msgid "Sort:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Opremi"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Upotrijebi"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Razdvoji"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr ""
 
@@ -993,17 +1006,17 @@ msgid "Weight:"
 msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Ispusti"
@@ -1057,51 +1070,51 @@ msgstr ""
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1109,7 +1122,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1117,33 +1130,33 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr ""
 
@@ -1245,7 +1258,7 @@ msgstr "Dostavi"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr ""
 
@@ -1283,328 +1296,329 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Trgovanje"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Promijeni poslužitelj"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Promijeni lika"
 
@@ -2129,10 +2143,6 @@ msgstr ""
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
@@ -2421,10 +2431,6 @@ msgstr ""
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Slika"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Tekst iznad glave"
@@ -2764,243 +2770,243 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -4172,41 +4178,41 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4214,27 +4220,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr ""
 
@@ -5486,19 +5492,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "%s nije u vašoj partiji!"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 8bd7cca8c..b622ecf27 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
 "PO-Revision-Date: 2011-08-09 22:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,57 +17,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Videó"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -77,63 +89,63 @@ msgstr ""
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Ismeretlen parancs."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "Nem küldhetsz üres üzenetet!"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -141,152 +153,152 @@ msgid ""
 msgstr ""
 "Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az."
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "A csapatnév hiányzik."
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "Az enter megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "Az üzenet bezárja a bevitelt."
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "Az enter mostantól megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "Az üzenet mostantól bezárja a bevitelt."
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -305,15 +317,15 @@ msgstr "Általános"
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr ""
 
@@ -321,19 +333,19 @@ msgstr ""
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Kereskedési kérelmek elutasítása"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
@@ -367,18 +379,19 @@ msgid "Name"
 msgstr "Név"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Támadás"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Csevegés"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr ""
 
@@ -391,8 +404,8 @@ msgid "Reset"
 msgstr "Alaphelyzet"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Vétel"
 
@@ -419,7 +432,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -436,8 +449,8 @@ msgstr "Max."
 msgid "Shop"
 msgstr "Üzlet"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -446,16 +459,16 @@ msgstr "Eladás"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -730,10 +743,10 @@ msgstr "Igen"
 msgid "No"
 msgstr "Nem"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr ""
 
@@ -879,7 +892,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Bezár"
 
@@ -896,7 +909,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -906,8 +919,8 @@ msgstr "Felszerelés"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Nem használ"
 
@@ -955,31 +968,31 @@ msgid "Sort:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Használ"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Bevet"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Felosztás"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr ""
 
@@ -988,17 +1001,17 @@ msgid "Weight:"
 msgstr "Súly:"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Eldob"
@@ -1052,91 +1065,91 @@ msgstr ""
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr ""
 
@@ -1238,7 +1251,7 @@ msgstr "Küldés"
 msgid "NPC"
 msgstr "Gépjátékos"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr ""
 
@@ -1276,328 +1289,329 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Üzlet"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Szerver változtatása"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Karakter változtatása"
 
@@ -2122,10 +2136,6 @@ msgstr ""
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
@@ -2414,10 +2424,6 @@ msgstr ""
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Videó"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Fej feletti szöveg"
@@ -2757,243 +2763,243 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -4167,68 +4173,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr ""
 
@@ -5482,19 +5488,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "%s nincs a csapatodban!"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index adc9bd48a..6b3177773 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,15 +2,16 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
 #   <adjieps@yahoo.com>, 2011.
-#   <Genesis_Junior@yahoo.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
+#   <Genesis_Junior@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
-"PO-Revision-Date: 2011-09-02 15:29+0000\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-16 20:12+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
 "id/)\n"
@@ -20,57 +21,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Video"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -80,63 +93,63 @@ msgstr "Pergantian server"
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/client.cpp:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Perintah tidak dikenal."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "Tidak dapat mengirimkan pesan tanpa nama"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -145,147 +158,147 @@ msgstr ""
 "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
 "atau nama anda sendiri"
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Meminta untuk masuk ke channel %s."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Nama kelompok tidak dapat di temukan"
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr "Nama organisasi tidak ditemukan."
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama"
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "Kembalikan pengalihan obrolan"
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "Tutup pesan obrolan"
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "Kembalikan sekarang pengalihan obrolan"
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "Pesan menutup obrolan"
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "Teman"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "Diabaikan"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "netral"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "Pemain telah %s!"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pemain telah berhasil %s!"
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Pemain tidak bisa %s!"
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "Pemain tidak diabaikan!"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "Pemain tidak lagi diabaikan!"
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "Pemain tidak dapat diabaikan"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "Pemain telah terhapus"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr "Pemain telah berhasil dihapus"
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr "Pemain tidak dapat dihapus"
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr "Ukuran jenis huruf cache"
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr "Ukuran Cache:"
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr "Buat"
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr "Hapus"
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr "Sumber gambar"
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -303,15 +316,15 @@ msgstr "Umum"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
@@ -319,19 +332,19 @@ msgstr "Koneksi ke server terputus"
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -365,18 +378,19 @@ msgid "Name"
 msgstr "Nama"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Pukul"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Berbicara"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "Jalan"
 
@@ -389,8 +403,8 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Beli"
 
@@ -417,7 +431,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -434,8 +448,8 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Toko"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -444,16 +458,16 @@ msgstr "Jual"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -728,10 +742,10 @@ msgstr "Ya"
 msgid "No"
 msgstr "Tidak"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "Abaikan"
 
@@ -877,7 +891,7 @@ msgstr "Apakah kamu tahu?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Tutup"
 
@@ -894,7 +908,7 @@ msgid "Auto open this window"
 msgstr "Buka jendela otomatis"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -904,8 +918,8 @@ msgstr "Perlengkapan"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Lepaskan"
 
@@ -914,18 +928,16 @@ msgid "Help"
 msgstr "Bantuan"
 
 #: src/gui/inventorywindow.cpp:71
-#, fuzzy
 msgid "by name"
-msgstr "Ganti nama"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:73
-#, fuzzy
 msgid "by weight"
-msgstr "Berat"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
@@ -953,31 +965,31 @@ msgid "Sort:"
 msgstr "Susun"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Pakai"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Gunakan"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "Buang..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Pecah"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "Setelan"
 
@@ -986,17 +998,17 @@ msgid "Weight:"
 msgstr "Berat"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Simpan"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Kembalikan"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Buang"
@@ -1050,89 +1062,89 @@ msgstr "Berat: %s"
 msgid "Kill stats"
 msgstr "Stat membunuh"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "Atur ulang stats"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "Atur ulang penghitung waktu"
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Level: %d pada %f%%"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d Tersisa:%d"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "%%= %d exp, rata-rata mob untuk 1%%: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Membunuh: %s, exp total: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Rata-rata: %s, No. dari rata-rata mob ke level selanjutnya: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Membunuh/menit: %s, Exp/menit: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Kecepatan Exp per %d menit: %s"
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Waktu sebelum naik ke level selanjutnya %d menit: %s"
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr "Exp terakhir"
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr "waktu sebelum Jacko kembali"
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "waktu untuk ke level selanjutnya: %s"
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr "Jacko bertelur"
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr ""
 
@@ -1234,7 +1246,7 @@ msgstr "Masukan"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "Hapus"
 
@@ -1272,328 +1284,329 @@ msgstr "Copot lebih dahulu"
 msgid "Away outfit"
 msgstr "Setelan saat bepergian"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Tukar"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr "Berbisik"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr "Menyembuhkan"
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr "Jadikan teman"
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr "Hapus"
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr "Batalkan pengabaian"
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr "Mengikuti"
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr "Tirukan"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr "keluarkan  pemain"
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr "Sembunyikan"
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr "Perlihatkan item"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr "Tanggalkan pakaian"
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr "Penambahan komentar"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr "keluarkan"
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr "Hapus dari daftar menyerang"
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr "Tambahkan prioritas daftar menyerang"
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr "Tambahkan ke daftar menyerang"
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr "Tambahkan ke daftar Abaikan"
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Tambahkan nama ke Obrolan"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr "Ambil"
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "Ambil ke obrolan"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr "Daftar barang"
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr "Ganti nama"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr "Hapus"
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr "Memuat setelan lama"
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Mantra"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr "Memuat mantra lama"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr "Edit mantra"
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr "hapus nama"
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr "Nama:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr "Komentar pemain"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr "komentar"
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr "Tambahkan semua ke Penukaran"
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "Masukkan 10"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "Masukkan setengah"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "Masukkan semua"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr "Buang semuanya"
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr "Muat jalan pintas iItem lama"
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr "Muat jalan pintas Buang yang lama"
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr "Sembunyikan"
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr "Tampilkan"
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(kembalikan)"
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr "Bergerak keatas"
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Ganti Server"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Ganti Karakter"
 
@@ -1995,9 +2008,8 @@ msgid "Draw hotkeys on map"
 msgstr ""
 
 #: src/gui/setup_other.cpp:87
-#, fuzzy
 msgid "Enable lazy scrolling"
-msgstr "Perbolehkan riwayat obrolan"
+msgstr ""
 
 #: src/gui/setup_other.cpp:90
 msgid "Scroll laziness"
@@ -2119,10 +2131,6 @@ msgstr ""
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
@@ -2411,10 +2419,6 @@ msgstr "Batas FPS:"
 msgid "Alt FPS limit: "
 msgstr "batas Alt FPS:"
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Video"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
@@ -2754,243 +2758,243 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) jalan normal"
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) jalan"
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?)bergerak ke target"
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) pukulan normal"
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti pukulan tanpa pelindung"
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) pukulan dengan pelindung"
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?)serangan"
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?)mengambil"
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) penampilan peta kosong"
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b)penampilan peta hitam & putih"
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magic"
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) serangan magic"
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) pergi"
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) pergi"
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Perombakan game tidak diperbolehkan"
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
@@ -4161,67 +4165,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr ""
 
@@ -5473,19 +5477,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr ""
 
@@ -5517,12 +5521,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr ""
-
-#~ msgid "na"
-#~ msgstr "t/a"
-
-#~ msgid "az"
-#~ msgstr "az"
-
-#~ msgid "id"
-#~ msgstr "id"
diff --git a/po/it.po b/po/it.po
index 5d837f2c4..f6c36cf0c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,15 +2,16 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Andrei Karas <akaras@inbox.ru>, 2011.
 #   <guglielmo__@hotmail.it>, 2011.
 # WildX <guglielmo__@hotmail.it>, 2011.
-# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
-"PO-Revision-Date: 2011-09-02 15:29+0000\n"
+"POT-Creation-Date: 2011-09-16 23:07+0300\n"
+"PO-Revision-Date: 2011-09-16 20:11+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +20,69 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:549
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being.cpp:549
+#: src/being.cpp:548
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1527
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1532
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Video"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr "Accesso"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr "Ricerca personaggi"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -79,63 +92,63 @@ msgstr "Cambiamento server del gioco"
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "Cambiamento password"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "Cambio Email"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
-#: src/client.cpp:1633
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1694
+#: src/client.cpp:1700
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "Impossibile inviare un sussurro vuoto!"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -144,152 +157,152 @@ msgstr ""
 "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
 "sei tu."
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Richiesta per accedere al canale %s."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr "Manca il nome della gilda."
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "Invio attiva/disattiva la conversazione."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "I messaggi chiudono la conversazione."
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "\"Invio\" adesso attiva/disattiva la conversazione."
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la conversazione."
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "Amico"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "Disprezzato"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "Neutro"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "Giocatore già %s!"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Giocatore %s con successo!"
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Player non può essere %s!"
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "Il giocatore non era ignorato!"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "Giocatore non più ignorato!"
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "Impossibile annullare l'ignoro!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "Il giocatore è già cancellato!"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr "Giocatore cancellato dal tuo schermo con successo!"
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr "Il giocatore non può essere cancellato!"
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -308,15 +321,15 @@ msgstr "Generale"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr "Screenshot salvato come"
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio della schermata fallito!"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è stata persa."
 
@@ -324,19 +337,19 @@ msgstr "La connessione al server è stata persa."
 msgid "Network Error"
 msgstr "Errore di rete"
 
-#: src/game.cpp:1236
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: src/game.cpp:1629
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "Impossibile caricare la mappa."
 
-#: src/game.cpp:1630
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
@@ -365,37 +378,38 @@ msgstr ""
 msgid "Bot Checker"
 msgstr "Bot Checker"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Attacco"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Parla"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "Movimento"
 
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
 msgid "Result"
 msgstr "Risultato"
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
 msgid "Reset"
 msgstr "Reimposta"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Compra"
 
@@ -422,7 +436,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -435,12 +449,12 @@ msgid "Max"
 msgstr "Massimo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
 msgid "Shop"
 msgstr "Negozio"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -449,16 +463,16 @@ msgstr "Vendi"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -559,7 +573,7 @@ msgstr "Taglio di capelli:"
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
 #: src/gui/socialwindow.cpp:1139
 msgid "Create"
 msgstr "Crea"
@@ -627,26 +641,26 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
 msgid "Choose"
 msgstr "Scegli"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 #, c-format
 msgid "Level %d"
 msgstr "Livello %d"
 
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
 msgid "(empty)"
 msgstr "(vuoto)"
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
 msgid "default"
 msgstr "Predefinito"
 
@@ -702,11 +716,12 @@ msgstr "Arcobaleno 2"
 msgid "rainbow 3"
 msgstr "Arcobaleno 3"
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -732,14 +747,14 @@ msgstr "Sì"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "Ignora"
 
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
 #: src/gui/setup_other.cpp:64
 msgid "Map"
 msgstr "Mappa"
@@ -880,8 +895,8 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Chiudi"
 
@@ -898,7 +913,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -906,10 +921,10 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Togli"
 
@@ -917,80 +932,88 @@ msgstr "Togli"
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
 msgid "Slots:"
 msgstr "Slot:"
 
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
 msgid "Sort:"
 msgstr "Ordina per:"
 
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "na"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "az"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "id"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Usa"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "Lascia..."
 
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Dividi"
 
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "Attrezzatura"
 
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Magazzino"
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Lascia"
@@ -1044,91 +1067,91 @@ msgstr "Peso: %s"
 msgid "Kill stats"
 msgstr "Statistiche uccisioni"
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "Reset statistiche"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "Reset timer"
 
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr ""
 
@@ -1226,11 +1249,11 @@ msgid "Submit"
 msgstr "Invia"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "Cancella"
 
@@ -1268,328 +1291,329 @@ msgstr "Rimuovi prima"
 msgid "Away outfit"
 msgstr "Away outfit"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Commercia"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Spells"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr "Nome:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "Salva 10"
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "Salva metà"
 
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "Salva tutto"
 
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr "Carica vecchie scorciatoie oggetti"
 
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr "Carica vecchie scorciatoie drop"
 
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Cambia server"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Cambia personaggio"
 
@@ -1829,7 +1853,7 @@ msgstr ""
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
 msgid "Other"
 msgstr ""
 
@@ -1992,122 +2016,130 @@ msgstr ""
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:88
-msgid "Moving"
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
 msgstr ""
 
 #: src/gui/setup_other.cpp:90
-msgid "Auto fix position"
+msgid "Scroll laziness"
 msgstr ""
 
 #: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:99
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:102
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
@@ -2117,27 +2149,27 @@ msgid "Auto adjust perfomance"
 msgstr ""
 
 #: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
+msgid "Hw acceleration"
 msgstr ""
 
 #: src/gui/setup_perfomance.cpp:64
-msgid "Hw acceleration"
+msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
 #: src/gui/setup_perfomance.cpp:67
-msgid "Enable opacity cache (Software, can use many memory)"
+msgid "Enable map reduce (Software)"
 msgstr ""
 
 #: src/gui/setup_perfomance.cpp:70
-msgid "Enable map reduce (Software)"
+msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
 #: src/gui/setup_perfomance.cpp:73
-msgid "Better quality (disable for better perfomance)"
+msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
-msgid "Enable alpha channel fix (Software, can be very slow)"
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
 msgstr ""
 
 #: src/gui/setup_perfomance.cpp:80
@@ -2392,14 +2424,10 @@ msgid "FPS limit:"
 msgstr ""
 
 #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Video"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Testo sovrastante"
@@ -2418,7 +2446,7 @@ msgstr ""
 
 #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
 msgid "None"
 msgstr ""
 
@@ -2524,22 +2552,22 @@ msgstr "Su"
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
@@ -2739,243 +2767,243 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -3465,23 +3493,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -4152,68 +4180,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr ""
 
@@ -4414,16 +4442,16 @@ msgstr ""
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -5469,19 +5497,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "%s non è nel tuo party!"
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index ef61ead4f..61154b831 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
-"PO-Revision-Date: 2011-09-09 22:37+0000\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-16 20:11+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
 "ja/)\n"
@@ -22,57 +22,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "ビデオ"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr "サーバー通信中…"
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr "ログイン中…"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr "ゲームの世界に入る中"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr "服：％d"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "ゲームサーバー通信中…"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "サーバーを入り替え中…"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -82,63 +94,63 @@ msgstr "サーバーを入り替え中…"
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "登録細目を要請中"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "パスワード変更成功！"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "メール変更"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "メール変更成功！"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "登録解除成功"
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "さよなら、いつでも戻ってね..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s は存在しないので作成することが不可能！終了中…"
 
-#: src/client.cpp:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:  %s"
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー： %s は存在しないので作成することが不可能！終了中…"
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "不明なコマンド"
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "空のメッセージを送信することはできません！"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -147,147 +159,147 @@ msgstr ""
 "%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分"
 "です。"
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "%sというチャンネルへの参加を要求しています。"
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "パーティ名がない。"
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr "ギルド名がない。"
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "名前を教えてください。"
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "リターンはチャットを留めておきます。"
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "メッセージはチャットを閉じます。"
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "リターンはこれからチャットを留めておきます。"
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "メッセージはこれからチャットを閉じます。"
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "友達"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "無視"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "プレイヤーはもう%s!"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "プレイヤーは%s成功！"
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr "選手は%sを居られなかった "
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "プレイヤーは無視されなかった！"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "プレイヤーはもう無視していない！"
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "Playerはunignoredことができなかった！"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "プレイヤーはもう消している!"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr "プレーアが首尾よくに消去！"
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間：%s"
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -306,15 +318,15 @@ msgstr "一般"
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存することに失敗しました！"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr ""
 
@@ -322,19 +334,19 @@ msgstr ""
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "他人からのトレードリクエストを無視します。"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "他人からのトレードリクエストを受け入れます。"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "マップをロードできませんでした"
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
@@ -368,18 +380,19 @@ msgid "Name"
 msgstr "名前"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "攻撃"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "話す"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "動く"
 
@@ -392,8 +405,8 @@ msgid "Reset"
 msgstr "リセット"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "買う"
 
@@ -420,7 +433,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -437,8 +450,8 @@ msgstr "最大"
 msgid "Shop"
 msgstr "店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -447,16 +460,16 @@ msgstr "売る"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -731,10 +744,10 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "無視"
 
@@ -880,7 +893,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "閉じる"
 
@@ -897,7 +910,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -907,8 +920,8 @@ msgstr "装備"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "外す"
 
@@ -954,31 +967,31 @@ msgid "Sort:"
 msgstr "類："
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "装備する"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "使う"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "落とす..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "分割する"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "服"
 
@@ -987,17 +1000,17 @@ msgid "Weight:"
 msgstr "重量"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "保存"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "取り戻す"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "落とす"
@@ -1051,89 +1064,89 @@ msgstr "重力：%s"
 msgid "Kill stats"
 msgstr "殺人統計ウィンドウ"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "統計をれセット"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "タイマーをれセット"
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr ""
 
@@ -1235,7 +1248,7 @@ msgstr "決定"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "クリア"
 
@@ -1273,328 +1286,329 @@ msgstr "外す第一"
 msgid "Away outfit"
 msgstr "装備一式不在で"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交換"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr "完全無視"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "チャットに追加"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr "マップアイテム"
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr "取り去る"
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "呪文"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr "でる"
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr " 名前:   "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr "に貿易を足す"
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "10保存"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "半分保存"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "全部保存"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "10取る"
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "半分取る"
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "全部取る"
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr " 隠す"
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr "見せる"
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "サーバーを切り替える"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "キャラクターを切り替える"
 
@@ -2121,10 +2135,6 @@ msgstr ""
 msgid "Show background"
 msgstr "背景を表示する"
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
@@ -2413,10 +2423,6 @@ msgstr "FPSリミット"
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "ビデオ"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "ヘッダーテキスト"
@@ -2756,243 +2762,243 @@ msgstr "パーティ名を選んでください"
 msgid "Specials"
 msgstr "スペシアール"
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) 動く"
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) 襲う"
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) 拾い上げる"
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) "
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) "
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) 不在で"
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -4170,67 +4176,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr "去って"
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr "従う: "
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr "擬い: "
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr "あなた"
 
@@ -5490,19 +5496,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "%sはパーティにはいない！"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr "'...'を表示する"
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr "名前を瞬き"
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr "フローティング'...'バブル"
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr "フローティングバブル"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 7a643a645..27ac0b8ce 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-09-10 01:34+0300\n"
+"POT-Creation-Date: 2011-09-17 16:12+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"
@@ -18,57 +18,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -78,215 +90,215 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -303,15 +315,15 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr ""
 
@@ -319,19 +331,19 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -365,18 +377,19 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr ""
 
@@ -389,8 +402,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr ""
 
@@ -417,7 +430,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -434,8 +447,8 @@ msgstr ""
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -444,16 +457,16 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -728,10 +741,10 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr ""
 
@@ -877,7 +890,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr ""
 
@@ -894,7 +907,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
@@ -904,8 +917,8 @@ msgstr ""
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr ""
 
@@ -951,31 +964,31 @@ msgid "Sort:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr ""
 
@@ -984,17 +997,17 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
@@ -1048,91 +1061,91 @@ msgstr ""
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr ""
 
@@ -1234,7 +1247,7 @@ msgstr ""
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr ""
 
@@ -1272,328 +1285,329 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -2118,10 +2132,6 @@ msgstr ""
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
@@ -2410,10 +2420,6 @@ msgstr ""
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr ""
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
@@ -2753,243 +2759,243 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -4160,68 +4166,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr ""
 
@@ -5471,19 +5477,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index d02ebbca5..0e25387f3 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
-"PO-Revision-Date: 2011-09-09 22:37+0000\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-16 20:12+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
 "manaplus/team/nl_BE/)\n"
@@ -20,57 +20,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Video"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -80,63 +92,63 @@ msgstr "Wijzigen spelservers"
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, 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:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, 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:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -145,152 +157,152 @@ msgstr ""
 "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
 "bestaat, of het is jezelf."
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr "Guild-naam ontbreekt."
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren"
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat"
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "Ga nu terug naar chat."
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "vriend"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "genegeerd"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "neutraal"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr "Speler succesvol verwijderd!"
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weken"
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagen"
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uren"
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d seconden"
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr "Aangemaakt:"
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr "Verwijdered:"
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -308,15 +320,15 @@ msgstr "Algemeen"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
@@ -324,19 +336,19 @@ msgstr "De verbinding met de server is verbroken."
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -370,18 +382,19 @@ msgid "Name"
 msgstr "Naam"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Spreken"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "Beweeg"
 
@@ -394,8 +407,8 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Kopen"
 
@@ -422,7 +435,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -439,8 +452,8 @@ msgstr "Maximum"
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -449,16 +462,16 @@ msgstr "Verkopen"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -733,10 +746,10 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "Negeer"
 
@@ -882,7 +895,7 @@ msgstr "Weet u?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Sluiten"
 
@@ -899,7 +912,7 @@ msgid "Auto open this window"
 msgstr ""
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -909,8 +922,8 @@ msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -956,31 +969,31 @@ msgid "Sort:"
 msgstr "Sorteer:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "Neerleggen..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Splitsen"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "Kleren"
 
@@ -989,17 +1002,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1053,91 +1066,91 @@ msgstr "Gewicht: %s"
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "Herzet statistieken"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "Herzet timer"
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tijd tot volgend niveau: %s"
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr ""
 
@@ -1239,7 +1252,7 @@ msgstr "Indienen"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "Wissen"
 
@@ -1277,328 +1290,329 @@ msgstr "Verwijder uitrusting eerst"
 msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr "Fluister"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr "Genees"
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr "Word vriend"
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr "Wis"
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr "Volg"
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr "Imiteer"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr "Schop speler"
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr "ontkleed"
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr "Schop"
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr "Raap op"
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr "Hernoem"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr "Verwijder"
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr "Inladen oude kleren"
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Spreuken"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr "Laad oude spreuken"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr "Verwijder naam"
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr "away aanzetten"
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr "away afzetten"
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr "Verlaat"
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "Plaats 10"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "Plaats de helft"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "Plaats alles"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr "Laden van oude voorwerpsnelkoppelingen"
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr "Laden van oude neerleggingsnelkoppeling"
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr "Verberg"
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr "Toon"
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(standaard)"
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Van server wisselen"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Van personage wisselen"
 
@@ -2125,10 +2139,6 @@ msgstr ""
 msgid "Show background"
 msgstr "Toon achtergrond"
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
@@ -2417,10 +2427,6 @@ msgstr "FPS limiet:"
 msgid "Alt FPS limit: "
 msgstr "Alt FPS limiet: "
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Video"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr ""
@@ -2766,243 +2772,243 @@ msgstr "Kies uw groepsnaam."
 msgid "Specials"
 msgstr "Specialen"
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) standaard bewegingen"
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) geïnverteerde bewegingen"
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegingen met vreemde bewegingen"
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normaal + raar"
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) beweeg"
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) manuele vreemde beweging"
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) vreemde beweging"
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) standaard bewegingen tot aan doel"
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bewegen tot aan doel in bereik 1"
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegen tot aan doel in bereik 2"
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegen tot aan doel in bereik 3"
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegen tot aan doel in bereik 5"
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegen tot aan doel in bereik 7"
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) beweeg tot aan doel"
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) standaard volgen"
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) relatief volgen"
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeld volgen"
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) huisdier volgen"
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) onbekend volgen"
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) standaard aanval"
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) wissel aanval zonder schild"
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) wissel aanval met schild"
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) aanval"
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) ga en val aan"
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) ga, val aan, raap op"
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) zonder auto aanval"
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) klein raap op 1x1 velden"
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standaard raap op 2x1 velden"
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) vooruit raap op 2x3 velden"
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) raap op 3x3 velden"
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) go en raap op met bereik 4"
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ga en raap op met bereik 8"
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ga en raap op zonder bereiklimiet"
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) raap op"
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) normale map tonen"
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) debug map tonen"
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) ultra map tonen"
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra map tonen 2"
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) lege map tonen"
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) zwart & witte map tonen"
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) map tonen"
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gebruik #flar voor magie aanval"
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gebruik #chiza voor magie aanval"
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) gebruik #ingrav voor magie aanval"
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gebruik #frillyar voor magie aanval"
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gebruik #upmarmu voor magie aanval"
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) magie aanval"
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) standaard imitatie"
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) kleren imitatie"
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) imitatie"
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) op toetsenbord"
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) weg"
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) weg"
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) spel camera modus"
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) design camera modus"
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -4184,68 +4190,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr "U bent gedoodt door "
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "U raapte op %d [@@%d|%s@@]."
 msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr "Weg"
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr "Volg: "
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr ""
 
@@ -5518,19 +5524,19 @@ msgstr "Verbinding met server beëindigd. "
 msgid "%s is not in your party!"
 msgstr "%s is niet in jouw groep!"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr "Say '...'"
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr "Blink naam"
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr "Zwevende '...' bel"
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr "Zwevende bel"
 
diff --git a/po/pt.po b/po/pt.po
index 6b1e0cf4e..8b2d54bbb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
-"PO-Revision-Date: 2011-09-09 22:37+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-16 20:15+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
 "pt/)\n"
 "Language: pt\n"
@@ -21,57 +21,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Performance"
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr "Temas"
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -81,63 +93,63 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, 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:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, 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:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -146,152 +158,152 @@ msgstr ""
 "Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
 "já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr "Tamanho do cache de fonte"
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr "Tamanho de Cache:"
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
@@ -309,15 +321,15 @@ msgstr "Geral"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
@@ -325,19 +337,19 @@ msgstr "A conexão com o servidor caiu."
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -371,18 +383,19 @@ msgid "Name"
 msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "Mover"
 
@@ -395,8 +408,8 @@ msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Comprar"
 
@@ -423,7 +436,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -440,8 +453,8 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -450,16 +463,16 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -734,10 +747,10 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -883,7 +896,7 @@ msgstr "Você sabia?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Fechar"
 
@@ -900,7 +913,7 @@ msgid "Auto open this window"
 msgstr "Abrir automaticamente esta janela"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -910,8 +923,8 @@ msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -921,23 +934,23 @@ msgstr "Ajuda"
 
 #: src/gui/inventorywindow.cpp:71
 msgid "by name"
-msgstr ""
+msgstr "por nome"
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
-msgstr ""
+msgstr "por id"
 
 #: src/gui/inventorywindow.cpp:73
 msgid "by weight"
-msgstr ""
+msgstr "por peso"
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
-msgstr ""
+msgstr "por quantidade"
 
 #: src/gui/inventorywindow.cpp:75
 msgid "by type"
-msgstr ""
+msgstr "por tipo"
 
 #: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
@@ -957,31 +970,31 @@ msgid "Sort:"
 msgstr "Classificar"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -990,17 +1003,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1054,91 +1067,91 @@ msgstr "Peso: %s"
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "Resetar Status"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "Resetar tempo"
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nível: %d em %f%%"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d faltando: %d"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, avg mob para 1%%: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s, total exp: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Avg Exp: %s, No de avg mob para o próximo nível: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Velocidade de exp por %d min: %s"
 msgstr[1] "Velocidade de exp por %d mins: %s"
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tempo para próximo nível por %d min: %s"
 msgstr[1] "Tempo para próximo nível por %d mins: %s"
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr "Exp de última morte:"
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr "Tempo para próximo JackO:"
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "Tempo para próximo nível:  %s"
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr "JackOvai aparecer"
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr "Você saiu da Guilda."
 
@@ -1240,7 +1253,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1278,328 +1291,329 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr "Sussuro"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr "Curar:"
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr "Ser Amigo"
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr "Ser inimigo"
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr "Apagar"
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr "Não ignorar"
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr "Imitar"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr "Deixar pelado"
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr "Mostar itens:"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr "Deixar sem Roupas"
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr "Remover da Lista de Ataques"
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr "Adicionar a prioridade na lista de ataques"
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr "A Remover"
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr "Urdidura"
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr "Carregar Antigas Roupas"
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr "Carregar Antigos Feitiços"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr "Não remova o nome"
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr "Remover nome"
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr "Mover a cima"
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr "Mover a baixo"
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Trocar servidor"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
@@ -2003,15 +2017,15 @@ msgstr "Desenhar atalhos no mapa"
 
 #: src/gui/setup_other.cpp:87
 msgid "Enable lazy scrolling"
-msgstr ""
+msgstr "Habilitar rolagem preguiçosa"
 
 #: src/gui/setup_other.cpp:90
 msgid "Scroll laziness"
-msgstr ""
+msgstr "Rolagem preguiçosa"
 
 #: src/gui/setup_other.cpp:93
 msgid "Scroll radius"
-msgstr ""
+msgstr "Velocidade de rolagem"
 
 #: src/gui/setup_other.cpp:97
 msgid "Moving"
@@ -2125,10 +2139,6 @@ msgstr "Ocultar sprite de escudo"
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr "Performance"
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Melhor performance (Habilite para melhor performance)"
@@ -2417,10 +2427,6 @@ msgstr "Limite FPS:"
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Vídeo"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
@@ -2764,243 +2770,243 @@ msgstr "Escolha o nome do seu grupo."
 msgid "Specials"
 msgstr "Especiais"
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) mover"
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) Visualizador de mapa"
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D)  Modo de jogo câmera design"
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
@@ -4176,68 +4182,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr "Você vê "
 
@@ -5513,19 +5519,19 @@ msgstr "Conexão com o servidor interrompida. "
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr "Piscar nome"
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ca955b19b..80d404092 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
-"PO-Revision-Date: 2011-09-09 22:37+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-16 20:15+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -23,57 +23,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
-msgstr "desviou"
+msgstr "por nome"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
-msgstr "errou"
+msgstr "por id"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
-msgstr "Configurar"
+msgstr "por peso"
+
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Performance"
 
-#: src/client.cpp:914
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr "Temas"
+
+#: src/client.cpp:932
 msgid "Connecting to server"
-msgstr "Conectando ao servidor"
+msgstr "por quantidade"
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
-msgstr "Efetuando login"
+msgstr "por tipo"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
-msgstr "Entrando no domínio do jogo"
+msgstr "Habilitar rolagem preguisoça "
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
-msgstr "Requisitando personagens"
+msgstr "Rolagem preguiçosa"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -83,63 +95,63 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, 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:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, 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:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -148,152 +160,152 @@ msgstr ""
 "Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
 "já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr "Tamanho de fonte Cache"
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr "Tamanho de cache:"
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
@@ -311,15 +323,15 @@ msgstr "Geral"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
@@ -327,19 +339,19 @@ msgstr "A conexão com o servidor caiu."
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -373,18 +385,19 @@ msgid "Name"
 msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "Mover"
 
@@ -397,8 +410,8 @@ msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Comprar"
 
@@ -425,7 +438,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -442,8 +455,8 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -452,16 +465,16 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -736,10 +749,10 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -885,7 +898,7 @@ msgstr "Você Sabia?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Fechar"
 
@@ -902,7 +915,7 @@ msgid "Auto open this window"
 msgstr "Auto abrir esta janela"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -912,8 +925,8 @@ msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -923,23 +936,23 @@ msgstr "Ajuda"
 
 #: src/gui/inventorywindow.cpp:71
 msgid "by name"
-msgstr ""
+msgstr "por nome"
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
-msgstr ""
+msgstr "por id"
 
 #: src/gui/inventorywindow.cpp:73
 msgid "by weight"
-msgstr ""
+msgstr "por peso"
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
-msgstr ""
+msgstr "por quantidade"
 
 #: src/gui/inventorywindow.cpp:75
 msgid "by type"
-msgstr ""
+msgstr "por tipo"
 
 #: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
@@ -959,31 +972,31 @@ msgid "Sort:"
 msgstr "Classificar"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -992,17 +1005,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1056,91 +1069,91 @@ msgstr "Peso: %s"
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "Resetar Status"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "Resetar tempo"
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nível: %d em %f%%"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d Falta: %d"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d ex, avg mob por 1%%: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s Total exp: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Avg Exp: %s No. de avg mob para próximo nível: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Velocidade de exp por %d min: %s"
 msgstr[1] "Velocidade de exp por %d mins: %s"
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tempo para o próximo nível %d min: %s "
 msgstr[1] "Tempo para o próximo nível %d mins: %s "
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr "Ultim exp por morte:"
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr "Tempo para próxima aparição do JackO:"
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "Tempo para próximo nível: %s"
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr "Aparição do JackO"
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr "Você saiu da Guilda."
 
@@ -1242,7 +1255,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1280,328 +1293,329 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr "Mensagem Privada:"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr "Cura"
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr "Ser amigo"
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr "Ser inimigo"
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr "Apagar"
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr "Não ignorar"
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr "Imitar"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr "Nu"
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr "Mostrar itens:"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr "Despir"
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr "Add comentário"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr "vender (?)"
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr "Remover da lista de ataque"
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr "Adicionar na prioridade da lista de ataques"
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr "Remover"
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr "Urdidura"
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr "Carregar velhas roupas"
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr "Carregar velhos feitiços"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr "Não retire o nome"
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr "Remover o nome"
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr "Mover para baixo"
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Trocar servidor"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
@@ -2005,15 +2019,15 @@ msgstr "Desenhar atalhos no mapa"
 
 #: src/gui/setup_other.cpp:87
 msgid "Enable lazy scrolling"
-msgstr ""
+msgstr "Habilitar rolagem preguiçosa"
 
 #: src/gui/setup_other.cpp:90
 msgid "Scroll laziness"
-msgstr ""
+msgstr "Rolagem preguiçosa"
 
 #: src/gui/setup_other.cpp:93
 msgid "Scroll radius"
-msgstr ""
+msgstr "Velocidade de rolagem"
 
 #: src/gui/setup_other.cpp:97
 msgid "Moving"
@@ -2127,10 +2141,6 @@ msgstr "Ocultar sprite de escudo"
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr "Performance"
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Melhor peformance (habilitar para melhor peformance)"
@@ -2419,10 +2429,6 @@ msgstr "Limite FPS:"
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Vídeo"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
@@ -2766,243 +2772,243 @@ msgstr "Escolha o nome do seu grupo."
 msgid "Specials"
 msgstr "Especiais"
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) mover"
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) Visualizador de mapa"
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D)  Modo de jogo câmera design"
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
@@ -4178,68 +4184,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr "Você vê "
 
@@ -5515,19 +5521,19 @@ msgstr "Conexão com o servidor interrompida. "
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr "Piscar nome"
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
diff --git a/po/ru.po b/po/ru.po
index 2db6bda60..d3548195c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
-"PO-Revision-Date: 2011-09-09 22:39+0000\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-16 20:13+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
 "ru/)\n"
@@ -23,57 +23,69 @@ msgstr ""
 "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/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Производительность"
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "Видео"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr "Темы"
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -83,63 +95,63 @@ msgstr "Смена игрового сервера"
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "Неизвестная команда."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "Нельзя отправлять пустые сообщения!"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -148,97 +160,97 @@ msgstr ""
 "Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
 "уже создана, или этот игрок Вы сами."
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Запрос на присоединение к каналу %s."
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Не указано название группы"
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr "Не задано имя гильдии."
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя"
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr "Enter переключает Вас на окно чата."
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "друг"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "нейтральный"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорируется!"
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из списка игнорирования!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr "Игрок удален!"
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -246,7 +258,7 @@ msgstr[0] "%d неделя"
 msgstr[1] "%d недели"
 msgstr[2] "%d недель"
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -254,7 +266,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -262,7 +274,7 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -270,7 +282,7 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -278,27 +290,27 @@ msgstr[0] "%d секунда"
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr "размер кеша шрифта"
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr "Размер кеша:"
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr "Создано:"
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr "Удалено:"
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr "Изображений:"
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
@@ -317,15 +329,15 @@ msgstr "Общие"
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
@@ -333,19 +345,19 @@ msgstr "Соединение с сервером потеряно."
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -379,18 +391,19 @@ msgid "Name"
 msgstr "Имя"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "Атака"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Разговор"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "Движение"
 
@@ -403,8 +416,8 @@ msgid "Reset"
 msgstr "Сбросить"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "Купить"
 
@@ -431,7 +444,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -448,8 +461,8 @@ msgstr "Макс"
 msgid "Shop"
 msgstr "Магазин"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -458,16 +471,16 @@ msgstr "Продать"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -742,10 +755,10 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "Игнорировать"
 
@@ -891,7 +904,7 @@ msgstr "Вы знаете?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Закрыть"
 
@@ -908,7 +921,7 @@ msgid "Auto open this window"
 msgstr "Автоматически открывать это окно"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "ОК"
 
@@ -918,8 +931,8 @@ msgstr "Снаряжение"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "Снять"
 
@@ -965,31 +978,31 @@ msgid "Sort:"
 msgstr "Сорт.:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "Надеть"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "Использовать"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "Разделить"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "Наряды"
 
@@ -998,17 +1011,17 @@ msgid "Weight:"
 msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Бросить"
@@ -1062,51 +1075,51 @@ msgstr "Вес: %s"
 msgid "Kill stats"
 msgstr "Окно статистики атак"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "Сбросить стат."
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "Сбросить таймер"
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Уровень: %d на %f%%"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Опыт: %d/%d Осталось: %d"
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d опыта, среднее кол-во мобов для 1%%: %s"
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Убийств: %s, опыта: %s"
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Средний опыт: %s, среднее кол-во мобов до след. уровня: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Убийств в минуту: %s, Опыта в минуту: %s"
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1114,7 +1127,7 @@ msgstr[0] "Опыт за %d мин.: %s"
 msgstr[1] "Опыт за %d мин.: %s"
 msgstr[2] "Опыт за %d мин.: %s"
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1122,33 +1135,33 @@ msgstr[0] "Время до следующего уровня в мин. %d: %s"
 msgstr[1] "Время до следующего уровня в мин. %d: %s"
 msgstr[2] "Время до следующего уровня в мин. %d: %s"
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr "Опыт за последнее убийство:"
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr "Время до появления jacko:"
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Время до следующего уровня: %s"
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr "jacko появляется"
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr "Вы покинули гильдию."
 
@@ -1250,7 +1263,7 @@ msgstr "Применить"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "Очистить"
 
@@ -1288,328 +1301,329 @@ msgstr "Сначала снять"
 msgid "Away outfit"
 msgstr "наряд отсутствия"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Торговать"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr "Приват"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr "Лечить"
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr "Подружиться"
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr "Пренебречь"
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr "Стереть"
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr "Не игнорировать"
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr "@@ignore|Полностью игнорировать@@"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr "Следовать"
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr "Имитировать"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr "Кикнуть игрока"
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr "Уничтожить"
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr "Показать предметы"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr "Раздеть"
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr "Добавить коментарий"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr "Кикнуть"
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr "Поднять"
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr "Элмент карты"
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr "Удалить"
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr "Прыгнуть"
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr "Загрузить старые наряды"
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Заклинания"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr "Загрузить старые заклинания"
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr "Не скрывать имя"
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr "Скрывать имя"
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr "Рарешить режим отошел"
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr "Запретить режим отошел"
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr "Покинуть"
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr "Имя:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr "Комментарий             "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr "Комментарий:                      "
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "Сохранить 10"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "Сохранить половину"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "Сохранить все"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr "Бросить все"
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "Получить половину"
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "Получить все"
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr "Загрузить старые горячие клавиши предметов"
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr "Загрузить старые данные"
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr "Спрятать"
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr "Показать"
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(по умолчанию)"
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr "Передвинуть выше"
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Сменить сервер"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Сменить персонажа"
 
@@ -2135,10 +2149,6 @@ msgstr "Спрятать картинку счита"
 msgid "Show background"
 msgstr "Показать фон"
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr "Производительность"
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Улучшение производительности (включите для большей производительности)"
@@ -2432,10 +2442,6 @@ msgstr "Ограничить кадр/с:"
 msgid "Alt FPS limit: "
 msgstr "Альтер. ограничить кадр/с: "
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Видео"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "Текст над головами"
@@ -2781,243 +2787,243 @@ msgstr "Выберите имя будущей группы."
 msgid "Specials"
 msgstr "Особые"
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr "(D) движения по умолчанию"
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда с сумашедшими движениями"
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение с сумашедшими движениями"
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и сумашедшие движения"
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr "(?) неизвестное движение"
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr "(a) пользовательские сумашедшие движения"
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr "(?) неизвестные сумасшедшие движения"
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на расстояние 1"
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на расстояние 2"
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на расстояние 3"
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на расстояние 5"
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на расстояние 7"
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на расстояние атаки"
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?) неизвестное движение к цели"
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr "(D) следование по умолчанию"
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr "(R) относительное следование"
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное следование"
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr "(P) следование как животное"
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr "(?) неизвестное следование"
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr "(D) обычная атака"
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки со щитом"
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) неизвестная атака"
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, собирать"
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) поднятие в области 1x1"
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) поднятие из области 2x1"
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) поднятие из области спереди 2x3"
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) поднятие из области 3x3"
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и поднятие на расстоянии 4"
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и поднятие на расстоянии 8"
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и поднятие на максимальном расстоянии"
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?) неизвестный режим поднятия"
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr "(u) специальный режим карты"
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr "(U) специальный режим карты 2"
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr "(e) режим пустой карты"
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr "(?) неизвестный режим карты"
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr "(f) использовать #flar для атаки"
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) использовать #chiza для атаки"
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) использовать #ingrav для атаки"
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) использовать #frillyar для атаки"
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) использовать #upmarmu для атаки"
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr "(?) неизвестная магическая атака"
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr "(D) имитация по умолчанию"
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr "(O) имитация нарядов"
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr "(?) неизвестная имитация"
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr "(A) отошел"
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr "(?) неизвестный режим отошел"
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr "(G) игровая камера"
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr "(D) камера в режиме разработки"
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
@@ -4195,41 +4201,41 @@ msgstr ""
 "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
 "вести."
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr "Вы были убиты "
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4237,27 +4243,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr "Вы видите "
 
@@ -5529,19 +5535,19 @@ msgstr "Подключение к серверу прервано."
 msgid "%s is not in your party!"
 msgstr "%s не в группе!"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr "Печатать '...'"
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr "Мигать именем"
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr "Плавающий '...' пузырек"
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr "Плавающий пузырек"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e159fa701..9170e805f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-10 01:34+0300\n"
-"PO-Revision-Date: 2011-09-09 22:37+0000\n"
+"POT-Creation-Date: 2011-09-17 16:12+0300\n"
+"PO-Revision-Date: 2011-09-16 20:12+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "team/zh_CN/)\n"
@@ -20,57 +20,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1046
+#: src/actorspritemanager.cpp:1088
 msgid "Visible on map"
 msgstr "在地图上可见"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:551
+#: src/being.cpp:548
 msgid "miss"
 msgstr "小姐"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1527
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1537
+#: src/being.cpp:1532
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:914
+#: src/client.cpp:841 src/gui/setup_perfomance.cpp:48
+msgid "Perfomance"
+msgstr "Perfomance"
+
+#: src/client.cpp:846 src/gui/setup_video.cpp:315
+msgid "Video"
+msgstr "视频"
+
+#: src/client.cpp:851
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:932
 msgid "Connecting to server"
 msgstr "连接到服务器"
 
-#: src/client.cpp:945
+#: src/client.cpp:963
 msgid "Logging in"
 msgstr "登录"
 
-#: src/client.cpp:978
+#: src/client.cpp:996
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
-#: src/client.cpp:1078
+#: src/client.cpp:1096
 msgid "Requesting characters"
 msgstr "请求字符"
 
-#: src/client.cpp:1109
+#: src/client.cpp:1127
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1137
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
+#: src/client.cpp:1180 src/client.cpp:1187 src/client.cpp:1321
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -80,210 +92,210 @@ msgstr "更改游戏服务器"
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1196
 msgid "Requesting registration details"
 msgstr "申请登记的详细信息"
 
-#: src/client.cpp:1199
+#: src/client.cpp:1222
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1200
+#: src/client.cpp:1223
 msgid "Password changed successfully!"
 msgstr "密码成功！"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1242
 msgid "Email Change"
 msgstr "电子邮件变更"
 
-#: src/client.cpp:1220
+#: src/client.cpp:1243
 msgid "Email changed successfully!"
 msgstr "电子邮件已变更成功！"
 
-#: src/client.cpp:1240
+#: src/client.cpp:1263
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1241
+#: src/client.cpp:1264
 msgid "Farewell, come back any time..."
 msgstr "永别了，任何时候回来... ..."
 
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
-#: src/client.cpp:1929 src/client.cpp:1936
+#: src/client.cpp:1463 src/client.cpp:1493 src/client.cpp:1508
+#: src/client.cpp:1933 src/client.cpp:1940
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1635
+#: src/client.cpp:1639
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1669 src/client.cpp:1675
+#: src/client.cpp:1673 src/client.cpp:1679
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1696
+#: src/client.cpp:1700
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:303
+#: src/commandhandler.cpp:196
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:295
 msgid "Cannot send empty whispers!"
 msgstr "无法发送空白密语！"
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:309
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:437
+#: src/commandhandler.cpp:329
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:345 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
-#: src/commandhandler.cpp:464
+#: src/commandhandler.cpp:356
 msgid "Guild name is missing."
 msgstr "公会名称是缺少的。"
 
-#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
-#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
+#: src/commandhandler.cpp:369 src/commandhandler.cpp:481
+#: src/commandhandler.cpp:522 src/commandhandler.cpp:552
 msgid "Please specify a name."
 msgstr "请指定一个名称。"
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:415
 msgid "Message closes chat."
 msgstr "讯息关闭聊天。"
 
-#: src/commandhandler.cpp:534
+#: src/commandhandler.cpp:426
 msgid "Return now toggles chat."
 msgstr "<回车>键现在切换聊天。"
 
-#: src/commandhandler.cpp:540
+#: src/commandhandler.cpp:432
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天。"
 
-#: src/commandhandler.cpp:568
+#: src/commandhandler.cpp:460
 msgid "friend"
 msgstr "朋友"
 
-#: src/commandhandler.cpp:573
+#: src/commandhandler.cpp:465
 msgid "disregarded"
 msgstr "无视"
 
-#: src/commandhandler.cpp:578
+#: src/commandhandler.cpp:470
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:489
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:503
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
-#: src/commandhandler.cpp:619
+#: src/commandhandler.cpp:511
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:533
 msgid "Player wasn't ignored!"
 msgstr "是不能忽视的！"
 
-#: src/commandhandler.cpp:648
+#: src/commandhandler.cpp:540
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽略！"
 
-#: src/commandhandler.cpp:650
+#: src/commandhandler.cpp:542
 msgid "Player could not be unignored!"
 msgstr "玩家不能被忽略!"
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:559
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
-#: src/commandhandler.cpp:678
+#: src/commandhandler.cpp:570
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:680
+#: src/commandhandler.cpp:572
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:872 src/commandhandler.cpp:918
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:990
+#: src/commandhandler.cpp:882
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:891
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:899
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:907
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1023
+#: src/commandhandler.cpp:915
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1102
+#: src/commandhandler.cpp:994
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1114
+#: src/commandhandler.cpp:1006
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1118
+#: src/commandhandler.cpp:1010
 msgid "Created:"
 msgstr "创建于："
 
-#: src/commandhandler.cpp:1120
+#: src/commandhandler.cpp:1012
 msgid "Deleted:"
 msgstr "删除："
 
-#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
+#: src/commandhandler.cpp:1059 src/commandhandler.cpp:1066
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
+#: src/commandhandler.cpp:1061 src/commandhandler.cpp:1068
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -300,15 +312,15 @@ msgstr "常规"
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:511
+#: src/game.cpp:513
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:519
+#: src/game.cpp:521
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:559
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
@@ -316,19 +328,19 @@ msgstr "服务器的连接丢失。"
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1243
+#: src/game.cpp:1320
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1330
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1636
+#: src/game.cpp:1729
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1637
+#: src/game.cpp:1730
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -362,18 +374,19 @@ msgid "Name"
 msgstr "姓名"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:596
 #: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
 msgid "Attack"
 msgstr "攻击"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:272
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "说话"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:276 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:729
 msgid "Move"
 msgstr "移动"
 
@@ -386,8 +399,8 @@ msgid "Reset"
 msgstr "重置"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:654
 msgid "Buy"
 msgstr "购买"
 
@@ -414,7 +427,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
 #: src/keyboardconfig.cpp:290
 msgid "Quit"
@@ -431,8 +444,8 @@ msgstr "最大"
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:257
+#: src/gui/popupmenu.cpp:274 src/gui/popupmenu.cpp:655
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -441,16 +454,16 @@ msgstr "出售"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
-#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
-#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
-#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
-#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
-#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
-#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:486 src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:745 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1722
+#: src/gui/popupmenu.cpp:1778 src/gui/popupmenu.cpp:1823
+#: src/gui/popupmenu.cpp:1858 src/gui/popupmenu.cpp:1897
+#: src/gui/popupmenu.cpp:1949 src/gui/popupmenu.cpp:1969
+#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:161
@@ -725,10 +738,10 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
-#: src/gui/popupmenu.cpp:669
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:377 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:614
 msgid "Ignore"
 msgstr "忽略"
 
@@ -874,7 +887,7 @@ msgstr "你知道吗？"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:556 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "关闭"
 
@@ -891,7 +904,7 @@ msgid "Auto open this window"
 msgstr "自动打开这个窗口"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "确定"
 
@@ -901,8 +914,8 @@ msgstr "装备"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1656 src/gui/popupmenu.cpp:1748
+#: src/gui/popupmenu.cpp:1793
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -948,31 +961,31 @@ msgid "Sort:"
 msgstr "排序："
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
-#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1750 src/gui/popupmenu.cpp:1795
 msgid "Equip"
 msgstr "装备"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
-#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1662
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1754
+#: src/gui/popupmenu.cpp:1799
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1667 src/gui/popupmenu.cpp:1759
+#: src/gui/popupmenu.cpp:1804
 msgid "Drop..."
 msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1676
+#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1813
 msgid "Split"
 msgstr "分离"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:519
 msgid "Outfits"
 msgstr "装具"
 
@@ -981,17 +994,17 @@ msgid "Weight:"
 msgstr "重量："
 
 #: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1642 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1816 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1683
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1764 src/gui/popupmenu.cpp:1809
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丢弃"
@@ -1045,89 +1058,89 @@ msgstr "重量：%s"
 msgid "Kill stats"
 msgstr "杀敌统计"
 
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
 msgid "Reset stats"
 msgstr "复位统计"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:68
 msgid "Reset timer"
 msgstr "复位定时器"
 
-#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "等级:%d 在 %f%%"
 
-#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
-#: src/gui/killstats.cpp:227
+#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
+#: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:236
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
-#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
+#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
-#: src/gui/killstats.cpp:239
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
+#: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
-#: src/gui/killstats.cpp:325
+#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
+#: src/gui/killstats.cpp:326
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
 msgstr "最后EXP："
 
-#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
-#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
-#: src/gui/killstats.cpp:374
+#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
+#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
-#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
-#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
+#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:363
+#: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:370
 msgid "jacko spawning"
 msgstr ""
 
-#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:439
 msgid "You have left the guild."
 msgstr "你已经离开工会."
 
@@ -1229,7 +1242,7 @@ msgstr "提交"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:558
 msgid "Clear"
 msgstr "清除"
 
@@ -1267,328 +1280,329 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:595
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:363
 msgid "Whisper"
 msgstr "密语"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:600
 msgid "Heal"
 msgstr "愈合"
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:606
 msgid "Be friend"
 msgstr "是朋友"
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:370
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:394
+#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:631
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:384 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:626
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
-#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:382
+#: src/gui/popupmenu.cpp:388 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:619 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:630
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:415
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:395
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:632
+#: src/playerrelations.cpp:418
 msgid "Completely ignore"
 msgstr "完全忽略"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
-#: src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:719
 msgid "Follow"
 msgstr "按照"
 
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:641 src/gui/popupmenu.cpp:720
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:673
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:678
 msgid "Kick from party"
 msgstr "踢从党"
 
-#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:220
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:695
 msgid "Kick from guild"
 msgstr "踢从公会"
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:700
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
-#: src/gui/popupmenu.cpp:776
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:709
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:241
 msgid "Kick player"
 msgstr "踢球员"
 
-#: src/gui/popupmenu.cpp:262
+#: src/gui/popupmenu.cpp:243
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:245 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:732
 msgid "Show Items"
 msgstr "显示项目"
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:733 src/gui/popupmenu.cpp:1966
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:786
+#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:734
 msgid "Add comment"
 msgstr "发表评论"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:660 src/gui/popupmenu.cpp:739
 msgid "Buy (?)"
 msgstr "购买(?)"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:661 src/gui/popupmenu.cpp:740
 msgid "Sell (?)"
 msgstr "出售(?)"
 
-#: src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:288
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:299
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:304
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
-#: src/gui/popupmenu.cpp:335
+#: src/gui/popupmenu.cpp:306
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
-#: src/gui/popupmenu.cpp:338
+#: src/gui/popupmenu.cpp:308
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:457
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:482
 msgid "Pick up"
 msgstr "拾取"
 
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
-#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1772 src/gui/popupmenu.cpp:1817
 msgid "Add to chat"
 msgstr "加入聊天"
 
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:500
 msgid "Map Item"
 msgstr "地图项"
 
-#: src/gui/popupmenu.cpp:531
+#: src/gui/popupmenu.cpp:501
 msgid "Rename"
 msgstr "重命名"
 
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
-#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
+#: src/gui/popupmenu.cpp:502 src/gui/popupmenu.cpp:1927
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1942
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:507
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:520
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:536 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "法术"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:537
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:538
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:562
 msgid "Disable highlight"
 msgstr "禁用"
 
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:564
 msgid "Enable highlight"
 msgstr "启用突出"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:566
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:611
+#: src/gui/popupmenu.cpp:568
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:570
 msgid "Enable away"
 msgstr "启用远"
 
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:572
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:577 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr "留下"
 
-#: src/gui/popupmenu.cpp:798
+#: src/gui/popupmenu.cpp:753
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1205
 msgid "Rename map sign          "
 msgstr "重命名的地图标志"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1236
+#: src/gui/popupmenu.cpp:1207
 msgid "Name:                    "
 msgstr "名称："
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1257
 msgid "Player comment            "
 msgstr "玩家评论"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1259
 msgid "Comment:                      "
 msgstr "评论："
 
-#: src/gui/popupmenu.cpp:1660
+#: src/gui/popupmenu.cpp:1630
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1634
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1635
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1636
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1646
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1647
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/popupmenu.cpp:1648
 msgid "Store all"
 msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop all"
 msgstr "所有"
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1687
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1688
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1689
 msgid "Retrieve all"
 msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1720 src/gui/popupmenu.cpp:1776
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1821
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1847 src/gui/popupmenu.cpp:1882
 msgid "Hide"
 msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1888
 msgid "Show"
 msgstr "显示"
 
-#: src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1894
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1896 src/gui/statuswindow.cpp:241
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1914 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1935
 msgid "Move up"
 msgstr "x"
 
-#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1937
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:51
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "交换服务器"
 
-#: src/gui/quitdialog.cpp:52
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "交换角色"
 
@@ -2113,10 +2127,6 @@ msgstr ""
 msgid "Show background"
 msgstr "显示背景"
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr "Perfomance"
-
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
@@ -2405,10 +2415,6 @@ msgstr "FPS限制："
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "视频"
-
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
 msgstr "头顶文字"
@@ -2748,243 +2754,243 @@ msgstr "选择n的名称。"
 msgid "Specials"
 msgstr "特价商品"
 
-#: src/gui/statuspopup.cpp:198
+#: src/gui/statuspopup.cpp:197
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:203
+#: src/gui/statuspopup.cpp:202
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:208
+#: src/gui/statuspopup.cpp:207
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:213
+#: src/gui/statuspopup.cpp:212
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:218
+#: src/gui/statuspopup.cpp:217
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:223
+#: src/gui/statuspopup.cpp:222
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:241
+#: src/gui/statuspopup.cpp:240
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:245
+#: src/gui/statuspopup.cpp:244
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:255
+#: src/gui/statuspopup.cpp:254
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:260
+#: src/gui/statuspopup.cpp:259
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:265
+#: src/gui/statuspopup.cpp:264
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:270
+#: src/gui/statuspopup.cpp:269
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:275
+#: src/gui/statuspopup.cpp:274
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:280
+#: src/gui/statuspopup.cpp:279
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:285
+#: src/gui/statuspopup.cpp:284
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:290
+#: src/gui/statuspopup.cpp:289
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/gui/statuspopup.cpp:298
+#: src/gui/statuspopup.cpp:297
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:301
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:305
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:309
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:313
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
+#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:328
+#: src/gui/statuspopup.cpp:327
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:333
+#: src/gui/statuspopup.cpp:332
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:349
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:353
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:357
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:376
+#: src/gui/statuspopup.cpp:375
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:379
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:383
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:387
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:391
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:395
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:399
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:403
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
-#: src/gui/statuspopup.cpp:413
+#: src/gui/statuspopup.cpp:412
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:416
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:420
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:424
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:428
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:432
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:436
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:445
+#: src/gui/statuspopup.cpp:444
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:450
+#: src/gui/statuspopup.cpp:449
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:455
+#: src/gui/statuspopup.cpp:454
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:460
+#: src/gui/statuspopup.cpp:459
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:465
+#: src/gui/statuspopup.cpp:464
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:468
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:478
+#: src/gui/statuspopup.cpp:477
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:481
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:485
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:495
+#: src/gui/statuspopup.cpp:494
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:498
+#: src/gui/statuspopup.cpp:497
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:509
+#: src/gui/statuspopup.cpp:508
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:512
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:516
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:528
+#: src/gui/statuspopup.cpp:527
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:533
+#: src/gui/statuspopup.cpp:532
 msgid "Game modifiers are enabled"
 msgstr ""
 
@@ -4155,67 +4161,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:377
 msgid "You were killed by "
 msgstr "你被打死"
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1416
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1418
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1420
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1419
+#: src/localplayer.cpp:1422
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1421
+#: src/localplayer.cpp:1424
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1424
+#: src/localplayer.cpp:1427
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1427
+#: src/localplayer.cpp:1430
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1454
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:3187
+#: src/localplayer.cpp:3168
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:3488
+#: src/localplayer.cpp:3468
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
+#: src/localplayer.cpp:3470 src/localplayer.cpp:3485
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3497
+#: src/localplayer.cpp:3477
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
+#: src/localplayer.cpp:3479 src/localplayer.cpp:3487
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3859
+#: src/localplayer.cpp:3832
 msgid "You see "
 msgstr "你看"
 
@@ -5473,19 +5479,19 @@ msgstr "连接到服务器终止。"
 msgid "%s is not in your party!"
 msgstr "%s不在你的帮会中！"
 
-#: src/playerrelations.cpp:429
+#: src/playerrelations.cpp:432
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:449
+#: src/playerrelations.cpp:452
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:493
+#: src/playerrelations.cpp:496
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:496
+#: src/playerrelations.cpp:499
 msgid "Floating bubble"
 msgstr "流动的泡沫"
author	Andrei Karas <akaras@inbox.ru>	2011-09-17 16:48:09 +0300
committer	Andrei Karas <akaras@inbox.ru>	2011-09-17 16:48:09 +0300
commit	d9926d7bb1436d0d624e8abbad2c9166b26e3a25 (patch)
tree	fe518ac75e095bd82c052b502e227f656775c894 /po
parent	73d6e00a4639680786e4f31ae29aeeaebba9a8ae (diff)
download	manaverse-d9926d7bb1436d0d624e8abbad2c9166b26e3a25.tar.gz manaverse-d9926d7bb1436d0d624e8abbad2c9166b26e3a25.tar.bz2 manaverse-d9926d7bb1436d0d624e8abbad2c9166b26e3a25.tar.xz manaverse-d9926d7bb1436d0d624e8abbad2c9166b26e3a25.zip