19 files changed, 5627 insertions, 5287 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index fe3b86f32..01fa8e017 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -42,6 +42,7 @@ src/gui/setup_audio.cpp
 src/gui/setup_chat.cpp
 src/gui/setup_colors.cpp
 src/gui/setup.cpp
+src/gui/setupitem.cpp
 src/gui/setup_joystick.cpp
 src/gui/setup_keyboard.cpp
 src/gui/setup_other.cpp
diff --git a/po/da.po b/po/da.po
index f9cc377ba..c14c5438b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
 "PO-Revision-Date: 2009-07-25 17:33+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -24,48 +24,48 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Synlige navne"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Opsætning"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Opretter forbindelse til kort-serveren..."
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 #, fuzzy
 msgid "Logging in"
 msgstr "Log Ind"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Vælg Karakter"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Opretter forbindelse til kort-serveren..."
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -75,52 +75,53 @@ msgstr "Server"
 msgid "Error"
 msgstr "Fejl"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 #, fuzzy
 msgid "Password Change"
 msgstr "Adgangskode:"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 #, fuzzy
 msgid "Email Change"
 msgstr "Ændre"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Frameld"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1564
+#: src/client.cpp:1587
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ugyldig opdaterings host: "
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -306,11 +307,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
@@ -350,21 +351,26 @@ msgstr "Kunne ikke loade kortet"
 msgid "Error while loading %s"
 msgstr "Kunne ikke loade %s."
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Gruppe (%s)"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, fuzzy, c-format
 msgid "Guild: %s"
 msgstr "Guilds"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
+#: src/gui/beingpopup.cpp:146
+#, fuzzy, c-format
+msgid "Comment: %s"
+msgstr "Kommando: /list"
+
 #: src/gui/botcheckerwindow.cpp:265
 #, fuzzy
 msgid "Bot Checker"
@@ -374,19 +380,19 @@ msgstr "Chat-vindue"
 msgid "Name"
 msgstr "Navn"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Angrib"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Snak"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 #, fuzzy
 msgid "Move"
 msgstr "Flyt op"
@@ -400,9 +406,9 @@ msgid "Reset"
 msgstr "Nulstil"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Køb"
 
@@ -446,9 +452,9 @@ msgstr "Maks"
 msgid "Shop"
 msgstr "butik"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Sælg"
@@ -456,15 +462,15 @@ msgstr "Sælg"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -737,7 +743,7 @@ msgstr "Regnbuefarvet"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr ""
 
@@ -759,10 +765,10 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 #, fuzzy
 msgid "Ignore"
 msgstr "Ignorer"
@@ -924,7 +930,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Luk"
 
@@ -954,8 +960,8 @@ msgstr "Udstyr"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Tag af"
 
@@ -996,32 +1002,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Tag på"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Brug"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 #, fuzzy
 msgid "Drop..."
 msgstr "Smid"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Opdel"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr ""
 
@@ -1030,17 +1036,17 @@ msgid "Weight:"
 msgstr "Vægt:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Gem på lager"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Smid"
@@ -1286,7 +1292,7 @@ msgstr "Send forespørgsel"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 #, fuzzy
 msgid "Clear"
 msgstr "Hellebard"
@@ -1327,333 +1333,348 @@ msgstr "Tag af"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handl"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Hvisk"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 #, fuzzy
 msgid "Be friend"
 msgstr "Ven"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 #, fuzzy
 msgid "Disregard"
 msgstr "Se bort fra"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 #, fuzzy
 msgid "Unignore"
 msgstr "Ignorer"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 #, fuzzy
 msgid "Completely ignore"
 msgstr "@@ignore||Ignorer %s fuldstændigt@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 #, fuzzy
 msgid "Follow"
 msgstr "lav"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "Imitation"
 msgstr "Skift e-mail adresse"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 #, fuzzy
 msgid "Invite to party"
 msgstr "/party > Inviter en spiller til din gruppe"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 #, fuzzy
 msgid "Kick from party"
 msgstr "@@admin-kick|Spark spiller ud@@"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 #, fuzzy
 msgid "Kick from guild"
 msgstr "@@admin-kick|Spark spiller ud@@"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 #, fuzzy
 msgid "Change pos in guild"
 msgstr "Ændre"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 #, fuzzy
 msgid "Invite to guild"
 msgstr "/party > Inviter en spiller til din gruppe"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 #, fuzzy
 msgid "Kick player"
 msgstr "Du kunne ikke sparke denne bruger af kanalen"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 #, fuzzy
 msgid "Show Items"
 msgstr "Vis navn"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 #, fuzzy
 msgid "Add to priority attack list"
 msgstr "@@attack|Angrib %s@@"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 #, fuzzy
 msgid "Add to attack list"
 msgstr "@@attack|Angrib %s@@"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 #, fuzzy
 msgid "Add to ignore list"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 #, fuzzy
 msgid "Pick up"
 msgstr "Saml op"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "Rename"
 msgstr "Husk Brugernavn"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 #, fuzzy
 msgid "Remove"
 msgstr "Husk Brugernavn"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Fremhæv tab"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Fremhæv tab"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "Remove name"
 msgstr "Husk Brugernavn"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 #, fuzzy
 msgid "Enable away"
 msgstr "Du kan ikke købe."
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "Disable away"
 msgstr "Slå handler fra/til"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 #, fuzzy
 msgid "Change guild position"
 msgstr "Ændre"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 #, fuzzy
 msgid "Store 10"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 #, fuzzy
 msgid "Store half"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 #, fuzzy
 msgid "Store all"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Drop all"
 msgstr "Smid"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 #, fuzzy
 msgid "Copy to chat"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 #, fuzzy
 msgid "(default)"
 msgstr "Standard"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 #, fuzzy
 msgid "Move up"
 msgstr "Flyt op"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 #, fuzzy
 msgid "Move down"
 msgstr "Flyt ned"
@@ -1816,125 +1837,123 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
 #, fuzzy
 msgid "Enable trade tab"
 msgstr "Du kan ikke købe."
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 #, fuzzy
 msgid "Enable battle tab"
 msgstr "Du kan ikke købe."
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 #, fuzzy
 msgid "Show battle events"
 msgstr "Vis navn"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 #, fuzzy
 msgid "Resize chat tabs if need"
 msgstr "Gå til næste chat tab"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Sådan ser farven ud."
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Farver"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 #, fuzzy
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Fastlåst"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulserende"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Regnbuefarvet"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 #, fuzzy
 msgid "Delay:"
 msgstr "Forsinkelse: "
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 #, fuzzy
 msgid "Red:"
 msgstr "Rød: "
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 #, fuzzy
 msgid "Green:"
 msgstr "Grøn: "
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 #, fuzzy
 msgid "Blue:"
 msgstr "Blå: "
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
@@ -1946,6 +1965,11 @@ msgstr "Anvend"
 msgid "Reset Windows"
 msgstr "Nulstil Vinduer"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Tryk på knappen for at starte justeringen."
@@ -1991,129 +2015,125 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr "Tast Konfikt(er) Opdaget."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:49
 #, fuzzy
-msgid "Highlight map portals"
-msgstr "Fremhæv"
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr ""
+msgid "Enable server side attack"
+msgstr "Du kan ikke købe."
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:58
 #, fuzzy
-msgid "Cycle monster targets"
-msgstr "Vis navn"
+msgid "Highlight map portals"
+msgstr "Fremhæv"
 
-#: src/gui/setup_other.cpp:135
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Aktiver joystick"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Fremhæv"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr ""
-
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:67
 #, fuzzy
-msgid "Enable shop mode"
-msgstr "Slå handler fra/til"
+msgid "Enable quick stats"
+msgstr "Aktiver joystick"
 
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:73
 #, fuzzy
-msgid "Enable debug log"
-msgstr "Du kan ikke købe."
-
-#: src/gui/setup_other.cpp:161
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Du kan ikke købe."
+msgid "Show warps particles"
+msgstr "som partikeleffekt"
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Aktiver joystick"
-
-#: src/gui/setup_other.cpp:173
-#, fuzzy
-msgid "Show warps particles"
-msgstr "som partikeleffekt"
-
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+#, fuzzy
+msgid "Cycle monster targets"
+msgstr "Vis navn"
+
+#: src/gui/setup_other.cpp:92
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Vis navn"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+#, fuzzy
+msgid "Enable bot checker"
+msgstr "Aktiver joystick"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+#, fuzzy
+msgid "Afk message"
+msgstr "Besked"
+
+#: src/gui/setup_other.cpp:114
 #, fuzzy
 msgid "Enable attack filter"
 msgstr "Du kan ikke købe."
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+#, fuzzy
+msgid "Enable shop mode"
+msgstr "Slå handler fra/til"
+
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
+#: src/gui/setup_other.cpp:123
 #, fuzzy
-msgid "Afk message"
-msgstr "Besked"
+msgid "Enable debug log"
+msgstr "Du kan ikke købe."
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2508,12 +2528,12 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Anmodning om byttehandel."
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, fuzzy, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vil gerne handle med dig. Accepterer du?"
@@ -4403,7 +4423,7 @@ msgstr "Tak for købet."
 msgid "Unable to buy."
 msgstr "Du kan ikke købe."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Styrke"
 
@@ -4412,7 +4432,7 @@ msgstr "Styrke"
 msgid "Strength %+.1f"
 msgstr "Styrke %+d"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Adræthed"
 
@@ -4421,7 +4441,7 @@ msgstr "Adræthed"
 msgid "Agility %+.1f"
 msgstr "Adræthed %+d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Behændighed"
 
@@ -4430,7 +4450,7 @@ msgstr "Behændighed"
 msgid "Dexterity %+.1f"
 msgstr "Behændighed %+d"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Helbred"
 
@@ -4439,7 +4459,7 @@ msgstr "Helbred"
 msgid "Vitality %+.1f"
 msgstr "Helbred %+d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Intelligens"
 
@@ -5003,55 +5023,55 @@ msgstr ""
 msgid "Unknown connection error."
 msgstr "Kunne ikke forbinde til serveren"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Blev smidt af serveren!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Held"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 #, fuzzy
 msgid "Defense"
 msgstr "Forsvar:"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 #, fuzzy
 msgid "M.Attack"
 msgstr "M.Angreb:"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 #, fuzzy
 msgid "M.Defense"
 msgstr "M.Forsvar:"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 #, fuzzy
 msgid "% Accuracy"
 msgstr "% præcission:"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 #, fuzzy
 msgid "% Evade"
 msgstr "% Undgå angreb."
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 #, fuzzy
 msgid "% Critical"
 msgstr "Kritisk sår"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Angreb %+d"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Angreb %+d"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 #, fuzzy
 msgid "Attack Range"
 msgstr "Monster rammer spiller"
@@ -5937,9 +5957,6 @@ msgstr "Ukendt genstand"
 #~ msgid "If <channel> doesn't exist, it's created."
 #~ msgstr "Hvis <chat-kanal> ikke eksisterer, så bliver den oprettet."
 
-#~ msgid "Command: /list"
-#~ msgstr "Kommando: /list"
-
 #~ msgid "This command shows a list of all channels."
 #~ msgstr "Denne kommando viser en liste over alle chat-kanaler."
 
diff --git a/po/de.po b/po/de.po
index be1897182..fdfa4909b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
-"PO-Revision-Date: 2011-06-11 17:16+0000\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
+"PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/de/)\n"
 "MIME-Version: 1.0\n"
@@ -23,43 +23,43 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr "verfehlt"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -69,49 +69,50 @@ msgstr ""
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr "Fordere Registrierungsdetails an"
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 msgid "Password Change"
 msgstr "Passwort ändern:"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, 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:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Unbekannter Update-Rechner: %s"
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -288,11 +289,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Allgemein"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Debug"
 
@@ -329,21 +330,26 @@ msgstr ""
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
 #: src/gui/botcheckerwindow.cpp:265
 msgid "Bot Checker"
 msgstr ""
@@ -352,19 +358,19 @@ msgstr ""
 msgid "Name"
 msgstr "Name"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Angriff"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Sprechen"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 msgid "Move"
 msgstr ""
 
@@ -377,9 +383,9 @@ msgid "Reset"
 msgstr "Zurücksetzten"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -423,9 +429,9 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Geschäft"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Verkaufen"
@@ -433,15 +439,15 @@ msgstr "Verkaufen"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -694,7 +700,7 @@ msgstr ""
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
@@ -716,10 +722,10 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 msgid "Ignore"
 msgstr ""
 
@@ -864,7 +870,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Schließen"
 
@@ -892,8 +898,8 @@ msgstr "Ausrüstung"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -931,31 +937,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Benutzen"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Aufteilen"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr "Ausrüstung"
 
@@ -964,17 +970,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Einlagern"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -1209,7 +1215,7 @@ msgstr "Absenden"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 msgid "Clear"
 msgstr ""
 
@@ -1247,291 +1253,306 @@ msgstr "erstes ausziehen"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handeln"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 msgid "Move down"
 msgstr ""
 
@@ -1687,116 +1708,114 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Soundengine"
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
-msgid "Enable chat Log"
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:92
-msgid "Enable trade tab"
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
-msgid "Hide shop messages"
+#: src/gui/setup_chat.cpp:73
+msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:100
-msgid "Show chat history"
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
-msgid "Enable battle tab"
+#: src/gui/setup_chat.cpp:79
+msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
-msgid "Show battle events"
+#: src/gui/setup_chat.cpp:82
+msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:85
+msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
+#: src/gui/setup_chat.cpp:88
+msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
+#: src/gui/setup_chat.cpp:91
+msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
+#: src/gui/setup_chat.cpp:94
+msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:134
-msgid "Resize chat tabs if need"
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "So wird die Farbe aussehen"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Farben"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Statisch"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulsierend"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Regenbogen"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr "Verzögerung: "
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr "Rot: "
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr "Grün: "
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr "Blau: "
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
@@ -1808,6 +1827,11 @@ msgstr "Anwenden"
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
@@ -1852,116 +1876,112 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
-msgid "Highlight map portals"
-msgstr ""
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
-msgid "Cycle monster targets"
+#: src/gui/setup_other.cpp:58
+msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
-msgid "Enable bot checker"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr ""
-
-#: src/gui/setup_other.cpp:152
-msgid "Enable shop mode"
+#: src/gui/setup_other.cpp:67
+msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
-msgid "Enable debug log"
+#: src/gui/setup_other.cpp:73
+msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
-msgid "Enable server side attack"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-msgid "Enable quick stats"
+#: src/gui/setup_other.cpp:86
+msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
-msgid "Show warps particles"
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:92
+msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
-msgid "Show own hp bar"
+#: src/gui/setup_other.cpp:98
+msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
-msgid "Afk message"
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
 msgstr ""
 
 #: src/gui/setup_players.cpp:65
@@ -2333,12 +2353,12 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Erbitte einen Handel"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -4114,7 +4134,7 @@ msgstr "Vielen Dank für den Einkauf."
 msgid "Unable to buy."
 msgstr "Kauf fehlgeschlagen."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Stärke"
 
@@ -4123,7 +4143,7 @@ msgstr "Stärke"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Beweglichkeit"
 
@@ -4132,7 +4152,7 @@ msgstr "Beweglichkeit"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Ausdauer"
 
@@ -4141,7 +4161,7 @@ msgstr "Ausdauer"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Gesundheit"
 
@@ -4150,7 +4170,7 @@ msgstr "Gesundheit"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Intelligenz"
 
@@ -4681,47 +4701,47 @@ msgstr "Mehrfache Anmeldung"
 msgid "Unknown connection error."
 msgstr "Unbekannter Verbindungsfehler"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Glück"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 msgid "Defense"
 msgstr "Verteidigung:"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "M.Attack"
 msgstr "M.Angriff:"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Defense"
 msgstr "M.Verteidigung:"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "% Evade"
 msgstr "% Evade"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "% Critical"
 msgstr "% Critical"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Range"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index b20d349b2..a491d45e4 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
 "PO-Revision-Date: 2010-03-04 21:01+0000\n"
 "Last-Translator: issyl0 <isabell121@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -24,48 +24,48 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Visible names"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Setup"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Connecting to map server..."
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 #, fuzzy
 msgid "Logging in"
 msgstr "Login"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Select Character"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Connecting to map server..."
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -75,53 +75,54 @@ msgstr "Server"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 #, fuzzy
 msgid "Password Change"
 msgstr "Password:"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 #, fuzzy
 msgid "Email Change"
 msgstr "Change"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Member was promoted successfully."
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Unregister"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1564
+#: src/client.cpp:1587
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalid update host: "
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -309,11 +310,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
@@ -353,21 +354,26 @@ msgstr "Could not load map"
 msgid "Error while loading %s"
 msgstr "Error while loading %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Party (%s)"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, fuzzy, c-format
 msgid "Guild: %s"
 msgstr "Guilds"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
+#: src/gui/beingpopup.cpp:146
+#, fuzzy, c-format
+msgid "Comment: %s"
+msgstr "Command: /list"
+
 #: src/gui/botcheckerwindow.cpp:265
 #, fuzzy
 msgid "Bot Checker"
@@ -377,19 +383,19 @@ msgstr "Chat Window"
 msgid "Name"
 msgstr "Name"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Attack"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Talk"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 #, fuzzy
 msgid "Move"
 msgstr "Move Up"
@@ -403,9 +409,9 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Buy"
 
@@ -449,9 +455,9 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Shop"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Sell"
@@ -459,15 +465,15 @@ msgstr "Sell"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -740,7 +746,7 @@ msgstr "Rainbow"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
@@ -762,10 +768,10 @@ msgstr "Yes"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 #, fuzzy
 msgid "Ignore"
 msgstr "Ignored"
@@ -927,7 +933,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Close"
 
@@ -957,8 +963,8 @@ msgstr "Equipment"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Unequip"
 
@@ -999,32 +1005,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Equip"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Use"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 #, fuzzy
 msgid "Drop..."
 msgstr "Drop"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Split"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr ""
 
@@ -1033,17 +1039,17 @@ msgid "Weight:"
 msgstr "Weight:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Store"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Drop"
@@ -1289,7 +1295,7 @@ msgstr "Submit"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 #, fuzzy
 msgid "Clear"
 msgstr "Polearm"
@@ -1330,333 +1336,348 @@ msgstr "Unequip"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Trade"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Whisper"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 #, fuzzy
 msgid "Be friend"
 msgstr "Friend"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 #, fuzzy
 msgid "Disregard"
 msgstr "Disregarded"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 #, fuzzy
 msgid "Unignore"
 msgstr "Ignored"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 #, fuzzy
 msgid "Completely ignore"
 msgstr "@@ignore|Completely ignore %s@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 #, fuzzy
 msgid "Follow"
 msgstr "low"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "Imitation"
 msgstr "Change Email Address"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 #, fuzzy
 msgid "Invite to party"
 msgstr "/party > Invite a user to party"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 #, fuzzy
 msgid "Kick from party"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 #, fuzzy
 msgid "Kick from guild"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 #, fuzzy
 msgid "Change pos in guild"
 msgstr "Change"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 #, fuzzy
 msgid "Invite to guild"
 msgstr "/party > Invite a user to party"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 #, fuzzy
 msgid "Kick player"
 msgstr "Kick failed!"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 #, fuzzy
 msgid "Show Items"
 msgstr "Show name"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 #, fuzzy
 msgid "Add to priority attack list"
 msgstr "@@attack|Attack %s@@"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 #, fuzzy
 msgid "Add to attack list"
 msgstr "@@attack|Attack %s@@"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 #, fuzzy
 msgid "Add to ignore list"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 #, fuzzy
 msgid "Pick up"
 msgstr "Pick up"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "Rename"
 msgstr "Remember Username"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 #, fuzzy
 msgid "Remove"
 msgstr "Remember Username"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Tab Highlight"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Tab Highlight"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "Remove name"
 msgstr "Remember Username"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 #, fuzzy
 msgid "Enable away"
 msgstr "Unable to buy."
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "Disable away"
 msgstr "Allow/Disallow Trading"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 #, fuzzy
 msgid "Leave"
 msgstr "Large"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 #, fuzzy
 msgid "Change guild position"
 msgstr "Change"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 #, fuzzy
 msgid "Store 10"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 #, fuzzy
 msgid "Store half"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 #, fuzzy
 msgid "Store all"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Drop all"
 msgstr "Drop"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 #, fuzzy
 msgid "Copy to chat"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 #, fuzzy
 msgid "(default)"
 msgstr "Default"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 #, fuzzy
 msgid "Move up"
 msgstr "Move Up"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 #, fuzzy
 msgid "Move down"
 msgstr "Move Down"
@@ -1819,125 +1840,123 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
 #, fuzzy
 msgid "Enable trade tab"
 msgstr "Unable to buy."
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 #, fuzzy
 msgid "Enable battle tab"
 msgstr "Unable to buy."
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 #, fuzzy
 msgid "Show battle events"
 msgstr "Show name"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 #, fuzzy
 msgid "Resize chat tabs if need"
 msgstr "Next Chat Tab"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "This is what the colour looks like"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Colours"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 #, fuzzy
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Static"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulse"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Rainbow"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 #, fuzzy
 msgid "Delay:"
 msgstr "Delay: "
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 #, fuzzy
 msgid "Red:"
 msgstr "Red: "
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 #, fuzzy
 msgid "Green:"
 msgstr "Green: "
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 #, fuzzy
 msgid "Blue:"
 msgstr "Blue: "
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
@@ -1949,6 +1968,11 @@ msgstr "Apply"
 msgid "Reset Windows"
 msgstr "Reset Windows"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Press the button to start calibration"
@@ -1994,129 +2018,125 @@ msgstr "Default"
 msgid "Key Conflict(s) Detected."
 msgstr "Key Conflict(s) Detected."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:49
 #, fuzzy
-msgid "Highlight map portals"
-msgstr "Highlight"
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr ""
+msgid "Enable server side attack"
+msgstr "Unable to buy."
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:58
 #, fuzzy
-msgid "Cycle monster targets"
-msgstr "Show name"
+msgid "Highlight map portals"
+msgstr "Highlight"
 
-#: src/gui/setup_other.cpp:135
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Enable joystick"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Highlight"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr ""
-
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:67
 #, fuzzy
-msgid "Enable shop mode"
-msgstr "Allow/Disallow Trading"
+msgid "Enable quick stats"
+msgstr "Enable joystick"
 
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:73
 #, fuzzy
-msgid "Enable debug log"
-msgstr "Unable to buy."
-
-#: src/gui/setup_other.cpp:161
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Unable to buy."
+msgid "Show warps particles"
+msgstr "as particle"
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Enable joystick"
-
-#: src/gui/setup_other.cpp:173
-#, fuzzy
-msgid "Show warps particles"
-msgstr "as particle"
-
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+#, fuzzy
+msgid "Cycle monster targets"
+msgstr "Show name"
+
+#: src/gui/setup_other.cpp:92
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Show name"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+#, fuzzy
+msgid "Enable bot checker"
+msgstr "Enable joystick"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+#, fuzzy
+msgid "Afk message"
+msgstr "Message"
+
+#: src/gui/setup_other.cpp:114
 #, fuzzy
 msgid "Enable attack filter"
 msgstr "Unable to buy."
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+#, fuzzy
+msgid "Enable shop mode"
+msgstr "Allow/Disallow Trading"
+
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
+#: src/gui/setup_other.cpp:123
 #, fuzzy
-msgid "Afk message"
-msgstr "Message"
+msgid "Enable debug log"
+msgstr "Unable to buy."
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2511,12 +2531,12 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Request for Trade"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, fuzzy, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s wants to trade with you, do you accept?"
@@ -4396,7 +4416,7 @@ msgstr "Thanks for buying."
 msgid "Unable to buy."
 msgstr "Unable to buy."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Strength"
 
@@ -4405,7 +4425,7 @@ msgstr "Strength"
 msgid "Strength %+.1f"
 msgstr "Strength %+d"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Agility"
 
@@ -4414,7 +4434,7 @@ msgstr "Agility"
 msgid "Agility %+.1f"
 msgstr "Agility %+d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Dexterity"
 
@@ -4423,7 +4443,7 @@ msgstr "Dexterity"
 msgid "Dexterity %+.1f"
 msgstr "Dexterity %+d"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Vitality"
 
@@ -4432,7 +4452,7 @@ msgstr "Vitality"
 msgid "Vitality %+.1f"
 msgstr "Vitality %+d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Intelligence"
 
@@ -5001,55 +5021,55 @@ msgstr "Duplicated login"
 msgid "Unknown connection error."
 msgstr "Unknown connection error"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Disconnected from server!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Luck"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 #, fuzzy
 msgid "Defense"
 msgstr "Defense:"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 #, fuzzy
 msgid "M.Attack"
 msgstr "M.Attack:"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 #, fuzzy
 msgid "M.Defense"
 msgstr "M.Defense:"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 #, fuzzy
 msgid "% Accuracy"
 msgstr "% Accuracy:"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 #, fuzzy
 msgid "% Evade"
 msgstr "% Evade:"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 #, fuzzy
 msgid "% Critical"
 msgstr "Critical Hit"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Attack %+d"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Attack %+d"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 #, fuzzy
 msgid "Attack Range"
 msgstr "Monster hits Player"
@@ -5944,9 +5964,6 @@ msgstr "Unknown item"
 #~ msgid "If <channel> doesn't exist, it's created."
 #~ msgstr "If <channel> doesn't exist, it's created."
 
-#~ msgid "Command: /list"
-#~ msgstr "Command: /list"
-
 #~ msgid "This command shows a list of all channels."
 #~ msgstr "This command shows a list of all channels."
 
diff --git a/po/es.po b/po/es.po
index d5158fbee..f59e0abef 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
-"PO-Revision-Date: 2011-06-11 17:16+0000\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
+"PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/manaplus/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -24,43 +24,43 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr "falla"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 msgid "Requesting characters"
 msgstr "Cargando jugadores"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Changing game servers"
 msgstr "Cambiando el servidor del juego"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -70,49 +70,50 @@ msgstr "Cambiando el servidor del juego"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr "¡La contraseña se cambió correctamente!"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr "¡Email modificado correctamente!"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, 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:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de actualización inválido: %s"
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "¡Error creando la carpeta de actualizaciones!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, 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."
@@ -288,11 +289,11 @@ msgstr "Imágenes de recurso huérfano:"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Depurador"
 
@@ -329,21 +330,26 @@ msgstr "No se pudo cargar el mapa"
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, c-format
 msgid "Guild: %s"
 msgstr "Gremio: %s"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Rango PVP: %d"
 
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
 #: src/gui/botcheckerwindow.cpp:265
 msgid "Bot Checker"
 msgstr "Control de bot"
@@ -352,19 +358,19 @@ msgstr "Control de bot"
 msgid "Name"
 msgstr "Nombre"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Hablar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 msgid "Move"
 msgstr "Mover"
 
@@ -377,9 +383,9 @@ msgid "Reset"
 msgstr "Restablecer"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Comprar"
 
@@ -423,9 +429,9 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Tienda"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Vender"
@@ -433,15 +439,15 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -694,7 +700,7 @@ msgstr "arco iris 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
@@ -716,10 +722,10 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -860,25 +866,25 @@ msgstr "Out: %d bytes/s"
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "¿Sabías que...?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Cerrar"
 
 #: src/gui/didyouknowwindow.cpp:62
 msgid "< Previous"
-msgstr ""
+msgstr "< Previo"
 
 #: src/gui/didyouknowwindow.cpp:63
 msgid "Next >"
-msgstr ""
+msgstr "Siguiente >"
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
-msgstr ""
+msgstr "Abrir automáticamente esta ventana"
 
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
@@ -892,8 +898,8 @@ msgstr "Equipamiento"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -931,31 +937,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr "Conjuntos"
 
@@ -964,17 +970,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Tirar"
@@ -1209,7 +1215,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -1247,291 +1253,306 @@ msgstr "Quitárselo antes"
 msgid "Away outfit"
 msgstr "Fuera conjunto"
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Intercambio"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr "Sanar"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 msgid "Be friend"
 msgstr "Ser amigo"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr "Desatender"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr "Borrar"
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 msgid "Unignore"
 msgstr "Des-ignorar"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 msgid "Imitation"
 msgstr "Imitación"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 msgid "Invite to party"
 msgstr "Invitar a grupo"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 msgid "Kick from party"
 msgstr "Sacar del grupo"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 msgid "Kick from guild"
 msgstr "Sacar del gremio"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el gremio"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 msgid "Invite to guild"
 msgstr "Invitar al gremio"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Kick player"
 msgstr "Sacar jugador"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Eliminar"
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 msgid "Show Items"
 msgstr "Mostrar artículos"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr "Desvestir"
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr "Sacar"
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritaria"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 msgid "Pick up"
 msgstr "Recoger"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr "Cargar conjuntos antiguos"
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Hechizos"
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr "Cargar hechizos antiguos"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr "No remover nombre"
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 msgid "Remove name"
 msgstr "Remover nombre"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Dejar"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr "Nombre:"
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 msgid "Add to trade"
 msgstr "Agredar al intercambio"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Drop all"
 msgstr "Tirar todo"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr "Cargar atajos antiguos de artículos"
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr "Cargar atajos antiguos de soltar (drop)"
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(predeterminado)"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
 msgstr "Subir"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 msgid "Move down"
 msgstr "Bajar"
 
@@ -1685,118 +1706,116 @@ msgstr "Necesitas reiniciar el client si quieres descargar la musica"
 msgid "Sound Engine"
 msgstr "Mecanismo de Sonido"
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr "Remover los colores de los mensajes recibidos en la charla"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr "Registrar mensajes de magia en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 "Permitir utilizar los comandos de magia y GM en todo tipo de ventana de "
 "dialogo"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr "Mostrar lista de colores del chat"
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr "Limitar máx. de caracteres en la línea de chat"
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr "Habilitar Registro de charla"
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr "Limitar líneas máx. en chat"
+
+#: src/gui/setup_chat.cpp:79
 msgid "Enable trade tab"
 msgstr "Habilitar pestaña de intercambio"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr "Ocultar mensajes de la tienda"
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr "Mostrar historial de charla"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 msgid "Enable battle tab"
 msgstr "Habilitar pestaña de batalla"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalla"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr "Mostrar lista de colores del chat"
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr "Editar"
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr "Limitar máx. de caracteres en la línea de chat"
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr "Limitar líneas máx. en chat"
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 msgid "Resize chat tabs if need"
 msgstr "Si hace falta, cambia el tamaño de ventanas de dialogo"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Así es como se verá el color"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Colores"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Estático"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulso"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Arcoiris"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr "Rojo:"
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr "Verde:"
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr "Azul:"
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -1808,6 +1827,11 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Aprieta el botón para empezar a calibrar"
@@ -1852,117 +1876,113 @@ msgstr "Por defecto"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflicto de teclas detectado."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Mostrar daño infligido a monstruos"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
+msgstr "Habilitar los ataques colaterales de servidor"
+
+#: src/gui/setup_other.cpp:52
 msgid "Auto target only reachable monsters"
 msgstr "Eligir automáticamente sólo a los monstruos alcanzables"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
+msgstr "Corrección automatica de la posición"
+
+#: src/gui/setup_other.cpp:58
 msgid "Highlight map portals"
 msgstr "Resaltar las puertas del mapa"
 
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr "Resaltar el alcance de ataque del jugador"
-
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
-msgstr "Resaltar el alcanze de ataque de los monstruos"
-
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
-msgstr "Rodear las dianas del jugador"
-
-#: src/gui/setup_other.cpp:132
-msgid "Cycle monster targets"
-msgstr "Rodear las dianas de los monstruos"
-
-#: src/gui/setup_other.cpp:135
-msgid "Enable bot checker"
-msgstr "Habilitar el control de robot"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr "Atacar mientras está en movimiento"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 msgid "Highlight floor items"
 msgstr "Resaltar los objetos sobre el suelo"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr "Programa de movimientos locos A"
-
-#: src/gui/setup_other.cpp:152
-msgid "Enable shop mode"
-msgstr "Habilitar la tienda"
-
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
-msgstr "Habilitar la proteción contra servidores defectuosos"
-
-#: src/gui/setup_other.cpp:158
-msgid "Enable debug log"
-msgstr "Habilitar registro de depuración"
-
-#: src/gui/setup_other.cpp:161
-msgid "Enable server side attack"
-msgstr "Habilitar los ataques colaterales de servidor"
-
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
-msgstr "Corrección automatica de la posición"
-
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
-msgstr "Atacar mientras está en movimiento"
-
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:67
 msgid "Enable quick stats"
 msgstr "Habilitar estadísticas rápidas"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
+msgstr "Resaltar el alcance de ataque del jugador"
+
+#: src/gui/setup_other.cpp:73
 msgid "Show warps particles"
 msgstr "Mostrar las partículas de efectos"
 
-#: src/gui/setup_other.cpp:176
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
+msgstr "Resaltar el alcanze de ataque de los monstruos"
+
+#: src/gui/setup_other.cpp:80
 msgid "Accept sell/buy requests"
 msgstr "Aceptar peticiones de compra / venta"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
+msgstr "Rodear las dianas del jugador"
+
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de energía del monstruo"
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
+msgstr "Rodear las dianas de los monstruos"
+
+#: src/gui/setup_other.cpp:92
 msgid "Show own hp bar"
 msgstr "Mostrar la propia barra de energía"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
+msgstr "Habilitar el control de robot"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr "Mostrar los mensajes de experiencia de trabajo"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr "Programa de movimientos locos A"
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr "Mostrar las ventanas emergentes de jugadores"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr "Mostrar minmapas extendidos"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr "Mensaje afk"
+
+#: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
-msgstr "Movimiento alocado A"
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
+msgstr "Habilitar la tienda"
 
-#: src/gui/setup_other.cpp:297
-msgid "Afk message"
-msgstr "Mensaje afk"
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
+msgstr "Habilitar la proteción contra servidores defectuosos"
+
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
+msgstr "Habilitar registro de depuración"
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2332,12 +2352,12 @@ msgstr "Anunciar"
 msgid "Show links in announce"
 msgstr "Mostrar enlaces en anuncio"
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
@@ -3529,11 +3549,11 @@ msgstr "DR"
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "YK"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "¿Sabías que..."
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
@@ -3744,7 +3764,7 @@ msgstr "Ventana de jugadores conectados"
 
 #: src/keyboardconfig.cpp:161
 msgid "Did you know Window"
-msgstr ""
+msgstr "Ventana ¿Sabías que.."
 
 #: src/keyboardconfig.cpp:164
 msgid "Previous Social Tab"
@@ -4115,7 +4135,7 @@ msgstr "Gracias por comprar."
 msgid "Unable to buy."
 msgstr "Imposible comprar."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Fuerza"
 
@@ -4124,7 +4144,7 @@ msgstr "Fuerza"
 msgid "Strength %+.1f"
 msgstr "Fuerza %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Agilidad"
 
@@ -4133,7 +4153,7 @@ msgstr "Agilidad"
 msgid "Agility %+.1f"
 msgstr "Agilidad %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Destreza"
 
@@ -4142,7 +4162,7 @@ msgstr "Destreza"
 msgid "Dexterity %+.1f"
 msgstr "Destreza %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Vitalidad"
 
@@ -4151,7 +4171,7 @@ msgstr "Vitalidad"
 msgid "Vitality %+.1f"
 msgstr "Vitalidad %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Inteligencia"
 
@@ -4678,47 +4698,47 @@ msgstr "Login duplicado."
 msgid "Unknown connection error."
 msgstr "Error de conexión desconocido."
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "¡Desconectado del servidor!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Suerte"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 msgid "Defense"
 msgstr "Defensa"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "M.Attack"
 msgstr "Ataque M."
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Defense"
 msgstr "Defensa M."
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "% Accuracy"
 msgstr "% Precisión"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "% Evade"
 msgstr "% Evasión"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "% Critical"
 msgstr "% Crítico"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "Attack Delay"
 msgstr "Retardo de Ataque"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Walk Delay"
 msgstr "Retardo de Marcha"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Range"
 msgstr "Alcance de Ataque"
 
diff --git a/po/fi.po b/po/fi.po
index b1eb1f07e..9d20d03be 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
-"PO-Revision-Date: 2011-06-11 17:16+0000\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
+"PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,43 +22,43 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr "huti"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -68,49 +68,50 @@ msgstr "Vaihdan pelipalvelinta"
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, 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:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, 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."
@@ -288,11 +289,11 @@ msgstr ""
 "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti"
 " \"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Debug"
 
@@ -329,21 +330,26 @@ msgstr "Kartan lataaminen epäonnistui"
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
 msgstr "Ryhmä: %s"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, c-format
 msgid "Guild: %s"
 msgstr "Kilta: %s"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "PvP-taso: %d"
 
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
 #: src/gui/botcheckerwindow.cpp:265
 msgid "Bot Checker"
 msgstr "Bottitutka"
@@ -352,19 +358,19 @@ msgstr "Bottitutka"
 msgid "Name"
 msgstr "Nimi"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Hyökkää"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Keskustele"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 msgid "Move"
 msgstr "Liiku"
 
@@ -377,9 +383,9 @@ msgid "Reset"
 msgstr "Nollaa"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Osta"
 
@@ -423,9 +429,9 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Kauppa"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Myy"
@@ -433,15 +439,15 @@ msgstr "Myy"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -694,7 +700,7 @@ msgstr "sateenkaari 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Keskustelu"
 
@@ -716,10 +722,10 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 msgid "Ignore"
 msgstr "Ohita"
 
@@ -864,7 +870,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Sulje"
 
@@ -892,8 +898,8 @@ msgstr "Varusteet"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
@@ -931,31 +937,31 @@ msgid "id"
 msgstr "#"
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Ota käyttöön"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Käytä"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
 msgstr "Pudota..."
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Jaa"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
 
@@ -964,17 +970,17 @@ msgid "Weight:"
 msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Varastoi"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Pudota"
@@ -1209,7 +1215,7 @@ msgstr "Lähetä"
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -1247,291 +1253,306 @@ msgstr "Riisu ensin"
 msgid "Away outfit"
 msgstr "Poissaoloasu"
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Tee kaupat"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Kuiskaa"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr "Paranna"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 msgid "Be friend"
 msgstr "Ystävysty"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr "Vaimenna"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr "Pyyhi"
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 msgid "Follow"
 msgstr "Seuraa"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 msgid "Imitation"
 msgstr "Matki"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Kick player"
 msgstr "Potki pelaaja"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Pommita"
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr "Riisu"
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr "Potki"
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr "Poista hyökkäyslistasta"
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 msgid "Add to priority attack list"
 msgstr "Lisää prioriteettihyökkäyslistalle"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 msgid "Pick up"
 msgstr "Nosta"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr "Karttaolio"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 msgid "Remove"
 msgstr "Poista"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr "Lataa vanhat asut"
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Loitsut"
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr "Lataa vanhat loitsut"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr "Älä poista nimeä"
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 msgid "Remove name"
 msgstr "Poista nimi"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Eroa"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 msgid "Store 10"
 msgstr "Varastoi 10"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 msgid "Store half"
 msgstr "Varastoi puolet"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr "Lataa vanhat tavarapikavalinnat"
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr "Lataa vanhat pudotuspikavalinnat"
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr "Piilota"
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr "Näytä"
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(oletus)"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
 msgstr "Siirrä ylös"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -1687,116 +1708,114 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Äänimoottori"
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr "Poista värit saapuneista keskusteluviesteistä"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr "Kirjaa magiaviestit debug-välilehdelle"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Salli magia ja GM-komennot kaikilla keskusteluvälilehdillä"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr "Näytä palvelinviestit debug-välilehdellä"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr "Näytä keskustelun värilista"
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr "Keskusteluviestin pituusraja"
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr "Kirjaa keskustelut"
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr "Keskusteluvälilehden riviraja"
+
+#: src/gui/setup_chat.cpp:79
 msgid "Enable trade tab"
 msgstr "Ota kaupankäyntivälilehti käyttöön"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr "Piilota kauppaviestit"
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr "Näytä keskusteluhistoria"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 msgid "Enable battle tab"
 msgstr "Ota taisteluvälilehti käyttöön"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 msgid "Show battle events"
 msgstr "Näytä taistelutapahtumat"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr "Näytä keskustelun värilista"
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr "Keskusteluviestin pituusraja"
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr "Keskusteluvälilehden riviraja"
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 msgid "Resize chat tabs if need"
 msgstr "Muuta välilehden kokoa tarpeen mukaan"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Väri näyttää tältä"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Värit"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Staattinen"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Sykkivä"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Sateenkaari"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spektri"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr "Viive:"
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr "Punainen:"
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr "Vihreä:"
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr "Sininen:"
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -1808,6 +1827,11 @@ msgstr "Hyväksy"
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr "Muokkaa"
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
@@ -1852,117 +1876,113 @@ msgstr "Oletus"
 msgid "Key Conflict(s) Detected."
 msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr "Sekal."
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Näytä hirviön saama vahinko"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
+msgstr "Ota käyttöön palvelinpuolen hyökkäys"
+
+#: src/gui/setup_other.cpp:52
 msgid "Auto target only reachable monsters"
 msgstr "Valikoi kohteiksi vain saavutettavia hirviöitä"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
+msgstr "Korjaa sijainti automaattisesti"
+
+#: src/gui/setup_other.cpp:58
 msgid "Highlight map portals"
 msgstr "Korosta karttasiirtymät"
 
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr "Korosta pelaajan hyökkäyskantama"
-
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
-msgstr "Korosta hirviön hyökkäyskantama"
-
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
-msgstr "Vaihda pelaajakohteita syklissä"
-
-#: src/gui/setup_other.cpp:132
-msgid "Cycle monster targets"
-msgstr "Vaihda hirviökohteita syklissä"
-
-#: src/gui/setup_other.cpp:135
-msgid "Enable bot checker"
-msgstr "Ota bottitutka käyttöön"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr "Hyökkää liikkuessa"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 msgid "Highlight floor items"
 msgstr "Korosta maassa olevat tavarat"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr "Villiliike (a) -ohjelma"
-
-#: src/gui/setup_other.cpp:152
-msgid "Enable shop mode"
-msgstr "Ota kauppatila käyttöön"
-
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
-msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
-
-#: src/gui/setup_other.cpp:158
-msgid "Enable debug log"
-msgstr "Ota käyttöön debug-loki"
-
-#: src/gui/setup_other.cpp:161
-msgid "Enable server side attack"
-msgstr "Ota käyttöön palvelinpuolen hyökkäys"
-
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
-msgstr "Korjaa sijainti automaattisesti"
-
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
-msgstr "Hyökkää liikkuessa"
-
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:67
 msgid "Enable quick stats"
 msgstr "Ota pikatilastot käyttöön"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
+msgstr "Korosta pelaajan hyökkäyskantama"
+
+#: src/gui/setup_other.cpp:73
 msgid "Show warps particles"
 msgstr "Näytä siirtymissä hiukkastehoste"
 
-#: src/gui/setup_other.cpp:176
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
+msgstr "Korosta hirviön hyökkäyskantama"
+
+#: src/gui/setup_other.cpp:80
 msgid "Accept sell/buy requests"
 msgstr "Salli osta/myy-pyynnöt"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
+msgstr "Vaihda pelaajakohteita syklissä"
+
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr "Näytä hirviön vp-palkki"
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
+msgstr "Vaihda hirviökohteita syklissä"
+
+#: src/gui/setup_other.cpp:92
 msgid "Show own hp bar"
 msgstr "Näytä oma vp-palkki"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
+msgstr "Ota bottitutka käyttöön"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr "Näytä työkokemusviestit"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr "Villiliike (a) -ohjelma"
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr "Näytä pelaajaponnahdusikkunat"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr "Näytä parannellut minikartat"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
 msgstr "Ota käyttöön hyökkäyssuodin"
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
-msgstr ""
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
+msgstr "Ota kauppatila käyttöön"
 
-#: src/gui/setup_other.cpp:297
-msgid "Afk message"
-msgstr ""
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
+msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
+
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
+msgstr "Ota käyttöön debug-loki"
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2331,12 +2351,12 @@ msgstr "Ilmoita"
 msgid "Show links in announce"
 msgstr "Näytä linkit ilmoituksessa"
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s haluaa %s %s - hyväksytkö?"
@@ -4114,7 +4134,7 @@ msgstr "Kiitos kaupoista."
 msgid "Unable to buy."
 msgstr "Ostaminen epäonnistui."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Voima"
 
@@ -4123,7 +4143,7 @@ msgstr "Voima"
 msgid "Strength %+.1f"
 msgstr "Voima %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Ketteryys"
 
@@ -4132,7 +4152,7 @@ msgstr "Ketteryys"
 msgid "Agility %+.1f"
 msgstr "Ketteryys %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Näppäryys"
 
@@ -4141,7 +4161,7 @@ msgstr "Näppäryys"
 msgid "Dexterity %+.1f"
 msgstr "Näppäryys %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Elinvoima"
 
@@ -4150,7 +4170,7 @@ msgstr "Elinvoima"
 msgid "Vitality %+.1f"
 msgstr "Elinvoima %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Älykkyys"
 
@@ -4678,47 +4698,47 @@ msgstr "Kaksinkertainen sisäänkirjautuminen."
 msgid "Unknown connection error."
 msgstr "Tuntematon yhteysongelma."
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Yhteys palvelimeen katkesi!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Tuuri"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 msgid "Defense"
 msgstr "Puolustus"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "M.Attack"
 msgstr "T.-hyökkäys"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Defense"
 msgstr "T.-puolustus"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "% Accuracy"
 msgstr "% Tarkkuus"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "% Evade"
 msgstr "% Välttö"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "% Critical"
 msgstr "% Täysosuma"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "Attack Delay"
 msgstr "Hyökkäysviive"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Walk Delay"
 msgstr "Kävelyviive"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Range"
 msgstr "Hyökkäyskantama"
 
diff --git a/po/fr.po b/po/fr.po
index 5b7111edc..caf017ee5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
-"PO-Revision-Date: 2011-06-11 17:16+0000\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
+"PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -24,43 +24,43 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr "esquivé"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr "raté"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -70,49 +70,50 @@ msgstr "Changement de serveur de jeu"
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, 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:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -290,11 +291,11 @@ msgstr "Images des ressources non affectées :"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Informations"
 
@@ -332,21 +333,26 @@ msgstr "La carte n'a pu être chargée"
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
 msgstr "Groupe : %s"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilde : %s"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Rang PvP : %d"
 
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
 #: src/gui/botcheckerwindow.cpp:265
 msgid "Bot Checker"
 msgstr "Testeur de Robot"
@@ -355,19 +361,19 @@ msgstr "Testeur de Robot"
 msgid "Name"
 msgstr "Nom"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Attaquer"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Parler"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 msgid "Move"
 msgstr "Déplacement"
 
@@ -380,9 +386,9 @@ msgid "Reset"
 msgstr "Réinitialiser"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Acheter"
 
@@ -426,9 +432,9 @@ msgstr "Max."
 msgid "Shop"
 msgstr "Boutique"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Vendre"
@@ -436,15 +442,15 @@ msgstr "Vendre"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -697,7 +703,7 @@ msgstr "arc en ciel 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Conversation"
 
@@ -719,10 +725,10 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -867,7 +873,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fermer"
 
@@ -895,8 +901,8 @@ msgstr "Équipement"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -934,31 +940,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Équiper"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Utiliser"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
 msgstr "Jeter..."
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Partager"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr "Tenues"
 
@@ -967,17 +973,17 @@ msgid "Weight:"
 msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Jeter"
@@ -1212,7 +1218,7 @@ msgstr "Soumettre"
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 msgid "Clear"
 msgstr "Effacer"
 
@@ -1250,291 +1256,306 @@ msgstr "Retirer d'abord l'équipement"
 msgid "Away outfit"
 msgstr "Équipement en absence"
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Échange"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Message"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr "Soigner"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 msgid "Be friend"
 msgstr "Être ami"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr "Éviter"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr "Éliminer"
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 msgid "Follow"
 msgstr "Suivre"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 msgid "Imitation"
 msgstr "Imiter"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 msgid "Kick from party"
 msgstr "Sortir du groupe"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 msgid "Kick from guild"
 msgstr "Sortir de la guilde"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Kick player"
 msgstr "Sortir le joueur"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Annihiler"
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 msgid "Show Items"
 msgstr "Montrer les objets"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr "Déshabiller"
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr "Virer"
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr "Enlever de la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 msgid "Add to priority attack list"
 msgstr "Ajouter à la liste de priorités d'attaque"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la boite de dialogue"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 msgid "Pick up"
 msgstr "Ramasser"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr "Objet de carte"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr "Charger les anciennes tenues"
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Sortilèges"
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr "Charger les anciens sorts"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr "Éditer le sortilège"
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr "N'enlève pas le nom"
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 msgid "Remove name"
 msgstr "Enlève le nom"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Quitter"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 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:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr "Nom : "
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 msgid "Store 10"
 msgstr "Entreposer 10"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 msgid "Store all"
 msgstr "Entreposer tout"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Drop all"
 msgstr "Jeter tout"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr "Charger les anciens raccourcis d'objets"
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr "Charger les anciens raccourcis de jets d'objets"
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr "Cacher"
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr "Montrer"
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(défaut)"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
 msgstr "Aller vers le haut"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -1689,116 +1710,114 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Moteur de son"
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr "Retirer les couleurs des messages de chat"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr "Messages de magie dans l'onglet \"informations\""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Messages de magie et commandes GM dans tous les onglets du chat"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr "Afficher les messages du serveur dans l'onglet \"informations\""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr "Montrer la liste des couleurs de chat"
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr "Limiter le nbre max de car d'une ligne de discussion"
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr "Activer l'enregistrement des conversations"
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr "Limiter le nbre max de lignes dans le chat"
+
+#: src/gui/setup_chat.cpp:79
 msgid "Enable trade tab"
 msgstr "Activer la boite de dialogue d'échanges"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr "Masquer les messages liés à la boutique"
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr "Afficher l'historique de discussion"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 msgid "Enable battle tab"
 msgstr "Activer l'onglet de combat"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 msgid "Show battle events"
 msgstr "Afficher les événements de combat"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr "Montrer la liste des couleurs de chat"
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr "Éditer"
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr "Limiter le nbre max de car d'une ligne de discussion"
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr "Limiter le nbre max de lignes dans le chat"
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 msgid "Resize chat tabs if need"
 msgstr "Si besoin est, changer la taille des fenêtre de dialogue"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Voilà à quoi ressemble cette couleur"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Type : "
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Statique"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Impulsion"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spectre"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr "Délai : "
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr "Rouge : "
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr "Vert : "
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr "Bleu : "
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr "Opacité : "
 
@@ -1810,6 +1829,11 @@ msgstr "Appliquer"
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr "Éditer"
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
@@ -1854,117 +1878,113 @@ msgstr "Par défaut"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté(s)"
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr "Divers"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Montrer les dégâts infligés aux monstres"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
+msgstr "Activer l'attaque de la part du serveur"
+
+#: src/gui/setup_other.cpp:52
 msgid "Auto target only reachable monsters"
 msgstr "Ne viser en auto que les monstres à portée de tir "
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
+msgstr "Auto-correction de position"
+
+#: src/gui/setup_other.cpp:58
 msgid "Highlight map portals"
 msgstr "Afficher les portails de changement de carte"
 
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr "Afficher la portée d'attaque du joueur"
-
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
-msgstr "Afficher la portée d'attaque des monstres"
-
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
-msgstr "Entourer les joueurs visés"
-
-#: src/gui/setup_other.cpp:132
-msgid "Cycle monster targets"
-msgstr "Entourer les monstres visés"
-
-#: src/gui/setup_other.cpp:135
-msgid "Enable bot checker"
-msgstr "Activer le testeur de robots"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr "Attaquer en bougeant"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 msgid "Highlight floor items"
 msgstr "Mettre en évidence les items sur le sol"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr "Programme A de mouvement de fou"
-
-#: src/gui/setup_other.cpp:152
-msgid "Enable shop mode"
-msgstr "Activer le mode boutique"
-
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
-msgstr "Activer la protection contre les serveurs instables"
-
-#: src/gui/setup_other.cpp:158
-msgid "Enable debug log"
-msgstr "Activer l'enregistrement des informations"
-
-#: src/gui/setup_other.cpp:161
-msgid "Enable server side attack"
-msgstr "Activer l'attaque de la part du serveur"
-
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
-msgstr "Auto-correction de position"
-
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
-msgstr "Attaquer en bougeant"
-
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:67
 msgid "Enable quick stats"
 msgstr "Activer les statistiques instantanées"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
+msgstr "Afficher la portée d'attaque du joueur"
+
+#: src/gui/setup_other.cpp:73
 msgid "Show warps particles"
 msgstr "Montrer les effets de déplacement"
 
-#: src/gui/setup_other.cpp:176
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
+msgstr "Afficher la portée d'attaque des monstres"
+
+#: src/gui/setup_other.cpp:80
 msgid "Accept sell/buy requests"
 msgstr "Accepter les requêtes d'achat et de vente"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
+msgstr "Entourer les joueurs visés"
+
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr "Afficher la barre de vie des monstres"
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
+msgstr "Entourer les monstres visés"
+
+#: src/gui/setup_other.cpp:92
 msgid "Show own hp bar"
 msgstr "Afficher votre propre barre de vie"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
+msgstr "Activer le testeur de robots"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr "Afficher les expériences de compétences"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr "Programme A de mouvement de fou"
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr "Afficher les pop-ups des joueurs"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr "Montrer les mini cartes étendues"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr "Message d'absence"
+
+#: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
 msgstr "Activer le mode attaque"
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
-msgstr "Mouvements Fous A"
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
+msgstr "Activer le mode boutique"
 
-#: src/gui/setup_other.cpp:297
-msgid "Afk message"
-msgstr "Message d'absence"
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
+msgstr "Activer la protection contre les serveurs instables"
+
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
+msgstr "Activer l'enregistrement des informations"
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2339,12 +2359,12 @@ msgstr "Annoncer"
 msgid "Show links in announce"
 msgstr "Montrer les liens dans l'annonce"
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s souhaite %s %s Acceptez-vous ?"
@@ -4140,7 +4160,7 @@ msgstr "Merci de votre achat."
 msgid "Unable to buy."
 msgstr "Incapable d'acheter."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Force"
 
@@ -4149,7 +4169,7 @@ msgstr "Force"
 msgid "Strength %+.1f"
 msgstr "Force %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Agilité"
 
@@ -4158,7 +4178,7 @@ msgstr "Agilité"
 msgid "Agility %+.1f"
 msgstr "Agilité %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Dextérité"
 
@@ -4167,7 +4187,7 @@ msgstr "Dextérité"
 msgid "Dexterity %+.1f"
 msgstr "Dextérité %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Vitalité"
 
@@ -4176,7 +4196,7 @@ msgstr "Vitalité"
 msgid "Vitality %+.1f"
 msgstr "Vitalité %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Intelligence"
 
@@ -4713,47 +4733,47 @@ msgstr "Authentification déjà effectuée."
 msgid "Unknown connection error."
 msgstr "Erreur de connexion inconnue."
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Vous avez été déconnecté du serveur !"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Chance"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 msgid "Defense"
 msgstr "Défense"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "M.Attack"
 msgstr "Attaque M."
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Defense"
 msgstr "Défense M."
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "% Accuracy"
 msgstr "% Précision"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "% Evade"
 msgstr "% Esquive"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "% Critical"
 msgstr "% Coup critique"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "Attack Delay"
 msgstr "Temps de l'attaque"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Walk Delay"
 msgstr "Temps de déplacement"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Range"
 msgstr "Portée de l'attaque"
 
diff --git a/po/hr.po b/po/hr.po
index 410589687..60132c3c9 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -25,48 +25,48 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Vidljiva imena"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 #, fuzzy
 msgid "Logging in"
 msgstr "Korisničko ime"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Odaberi lika"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -76,53 +76,54 @@ msgstr "Server"
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 #, fuzzy
 msgid "Password Change"
 msgstr "Lozinka"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 #, fuzzy
 msgid "Email Change"
 msgstr "Izmijeni"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Član je uspješno unaprijeđen."
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Odjavi"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -315,11 +316,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Općenito"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
@@ -359,21 +360,26 @@ msgstr "Ne mogu učitati karte"
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Partija (%s)"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, fuzzy, c-format
 msgid "Guild: %s"
 msgstr "Cehovi"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
+#: src/gui/beingpopup.cpp:146
+#, fuzzy, c-format
+msgid "Comment: %s"
+msgstr "Naredba: /list"
+
 #: src/gui/botcheckerwindow.cpp:265
 #, fuzzy
 msgid "Bot Checker"
@@ -383,19 +389,19 @@ msgstr "Chat Prozor"
 msgid "Name"
 msgstr "Ime"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Napad"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Govori"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 #, fuzzy
 msgid "Move"
 msgstr "Pomakni Gore"
@@ -409,9 +415,9 @@ msgid "Reset"
 msgstr "Poništi"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Kupi"
 
@@ -455,9 +461,9 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Trgovina"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Prodaj"
@@ -465,15 +471,15 @@ msgstr "Prodaj"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -745,7 +751,7 @@ msgstr "Duga"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
@@ -767,10 +773,10 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 #, fuzzy
 msgid "Ignore"
 msgstr "Ignorirano"
@@ -932,7 +938,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Zatvori"
 
@@ -962,8 +968,8 @@ msgstr "Oprema"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Skini opremu"
 
@@ -1004,32 +1010,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Opremi"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Upotrijebi"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 #, fuzzy
 msgid "Drop..."
 msgstr "Ispusti"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Razdvoji"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr ""
 
@@ -1038,17 +1044,17 @@ msgid "Weight:"
 msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Ispusti"
@@ -1296,7 +1302,7 @@ msgstr "Dostavi"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 #, fuzzy
 msgid "Clear"
 msgstr "Zatvori"
@@ -1337,333 +1343,348 @@ msgstr "Skini opremu"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Trgovanje"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Šapat"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 #, fuzzy
 msgid "Be friend"
 msgstr "Prijatelj"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 #, fuzzy
 msgid "Disregard"
 msgstr "Zanemareno"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 #, fuzzy
 msgid "Unignore"
 msgstr "Ignorirano"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 #, fuzzy
 msgid "Completely ignore"
 msgstr "@@ignore|Potpuno ignoriraj %s@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 #, fuzzy
 msgid "Follow"
 msgstr "nisko"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "Imitation"
 msgstr "Promijeni Email Adresu"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 #, fuzzy
 msgid "Invite to party"
 msgstr "/party > Pozovite korisnike na partiju"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 #, fuzzy
 msgid "Kick from party"
 msgstr "@@admin-kick|Šutni igrača@@"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 #, fuzzy
 msgid "Kick from guild"
 msgstr "@@admin-kick|Šutni igrača@@"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 #, fuzzy
 msgid "Change pos in guild"
 msgstr "Izmijeni"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 #, fuzzy
 msgid "Invite to guild"
 msgstr "/party > Pozovite korisnike na partiju"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 #, fuzzy
 msgid "Kick player"
 msgstr "Šut nije uspio!"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 #, fuzzy
 msgid "Show Items"
 msgstr "Prikaži ime"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 #, fuzzy
 msgid "Add to priority attack list"
 msgstr "@@attack|Napadni %s@@"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 #, fuzzy
 msgid "Add to attack list"
 msgstr "@@attack|Napadni %s@@"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 #, fuzzy
 msgid "Add to ignore list"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 #, fuzzy
 msgid "Pick up"
 msgstr "Pokupi"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "Rename"
 msgstr "Zapamti korisničko ime"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 #, fuzzy
 msgid "Remove"
 msgstr "Zapamti korisničko ime"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Istakni Karticu"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Istakni Karticu"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "Remove name"
 msgstr "Zapamti korisničko ime"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 #, fuzzy
 msgid "Enable away"
 msgstr "Ne može se kupiti"
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "Disable away"
 msgstr "Omogući/Onemogući Trgovanje"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 #, fuzzy
 msgid "Leave"
 msgstr "Veliko"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 #, fuzzy
 msgid "Change guild position"
 msgstr "Izmijeni"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 #, fuzzy
 msgid "Store 10"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 #, fuzzy
 msgid "Store half"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 #, fuzzy
 msgid "Store all"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Drop all"
 msgstr "Ispusti"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 #, fuzzy
 msgid "Copy to chat"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 #, fuzzy
 msgid "(default)"
 msgstr "Zadano"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 #, fuzzy
 msgid "Move up"
 msgstr "Pomakni Gore"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 #, fuzzy
 msgid "Move down"
 msgstr "Pomakni Dolje"
@@ -1826,125 +1847,123 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
 #, fuzzy
 msgid "Enable trade tab"
 msgstr "Ne može se kupiti"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 #, fuzzy
 msgid "Enable battle tab"
 msgstr "Ne može se kupiti"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 #, fuzzy
 msgid "Show battle events"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 #, fuzzy
 msgid "Resize chat tabs if need"
 msgstr "Sljedeća Chat Kartica"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Ovako izgleda boja"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Boje"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 #, fuzzy
 msgid "Type:"
 msgstr "Tip: "
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Statično"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulsiranje"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Duga"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spektar"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 #, fuzzy
 msgid "Delay:"
 msgstr "Odgoda: "
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 #, fuzzy
 msgid "Red:"
 msgstr "Crvena: "
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 #, fuzzy
 msgid "Green:"
 msgstr "Zelena: "
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 #, fuzzy
 msgid "Blue:"
 msgstr "Plava: "
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
@@ -1956,6 +1975,11 @@ msgstr "Primjeni"
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Pritisnite tipku za početak kalibracije"
@@ -2001,129 +2025,125 @@ msgstr "Zadano"
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:49
 #, fuzzy
-msgid "Highlight map portals"
-msgstr "Istakni"
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr ""
+msgid "Enable server side attack"
+msgstr "Ne može se kupiti"
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:58
 #, fuzzy
-msgid "Cycle monster targets"
-msgstr "Prikaži ime"
+msgid "Highlight map portals"
+msgstr "Istakni"
 
-#: src/gui/setup_other.cpp:135
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Omogući igraću palicu"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Istakni"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr ""
-
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:67
 #, fuzzy
-msgid "Enable shop mode"
-msgstr "Omogući/Onemogući Trgovanje"
+msgid "Enable quick stats"
+msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:73
 #, fuzzy
-msgid "Enable debug log"
-msgstr "Ne može se kupiti"
-
-#: src/gui/setup_other.cpp:161
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Ne može se kupiti"
+msgid "Show warps particles"
+msgstr "kao čestica"
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Omogući igraću palicu"
-
-#: src/gui/setup_other.cpp:173
-#, fuzzy
-msgid "Show warps particles"
-msgstr "kao čestica"
-
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+#, fuzzy
+msgid "Cycle monster targets"
+msgstr "Prikaži ime"
+
+#: src/gui/setup_other.cpp:92
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+#, fuzzy
+msgid "Enable bot checker"
+msgstr "Omogući igraću palicu"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+#, fuzzy
+msgid "Afk message"
+msgstr "Poruka"
+
+#: src/gui/setup_other.cpp:114
 #, fuzzy
 msgid "Enable attack filter"
 msgstr "Ne može se kupiti"
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+#, fuzzy
+msgid "Enable shop mode"
+msgstr "Omogući/Onemogući Trgovanje"
+
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
+#: src/gui/setup_other.cpp:123
 #, fuzzy
-msgid "Afk message"
-msgstr "Poruka"
+msgid "Enable debug log"
+msgstr "Ne može se kupiti"
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2516,12 +2536,12 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Zahtjev za Trgovanje"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, fuzzy, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s želi trgovati s vama, prihvaćate li?"
@@ -4399,7 +4419,7 @@ msgstr "Hvala za kupnju."
 msgid "Unable to buy."
 msgstr "Ne može se kupiti"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Snaga"
 
@@ -4408,7 +4428,7 @@ msgstr "Snaga"
 msgid "Strength %+.1f"
 msgstr "Snaga %+d"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Okretnost"
 
@@ -4417,7 +4437,7 @@ msgstr "Okretnost"
 msgid "Agility %+.1f"
 msgstr "Okretnost %+d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Spretnost"
 
@@ -4426,7 +4446,7 @@ msgstr "Spretnost"
 msgid "Dexterity %+.1f"
 msgstr "Spretnost %+d"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Vitalnost"
 
@@ -4435,7 +4455,7 @@ msgstr "Vitalnost"
 msgid "Vitality %+.1f"
 msgstr "Vitalnost %+d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Inteligencija"
 
@@ -4999,55 +5019,55 @@ msgstr "Dvostruka prijava"
 msgid "Unknown connection error."
 msgstr "Nepoznata pogreška veze"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Sreća"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 #, fuzzy
 msgid "Defense"
 msgstr "Obrana:"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 #, fuzzy
 msgid "M.Attack"
 msgstr "M.Napad:"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 #, fuzzy
 msgid "M.Defense"
 msgstr "M.Obrana:"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 #, fuzzy
 msgid "% Accuracy"
 msgstr "% Preciznost:"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 #, fuzzy
 msgid "% Evade"
 msgstr "% Izbjegavanje:"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 #, fuzzy
 msgid "% Critical"
 msgstr "Kritični Udarac"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Napad %+d"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Napad %+d"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 #, fuzzy
 msgid "Attack Range"
 msgstr "Čudovište pogađa Igrača"
@@ -5921,9 +5941,6 @@ msgstr "Nepoznati predmet"
 #~ msgid "If <channel> doesn't exist, it's created."
 #~ msgstr "Ako <channel> ne postoji, onda je napravljen."
 
-#~ msgid "Command: /list"
-#~ msgstr "Naredba: /list"
-
 #~ msgid "This command shows a list of all channels."
 #~ msgstr "Ova naredba prikazuje listu svih kanala."
 
diff --git a/po/hu.po b/po/hu.po
index 23860e9e2..349b2aa34 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -24,48 +24,48 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Látható nevek"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 #, fuzzy
 msgid "Logging in"
 msgstr "Belépés"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Szerver"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -75,53 +75,54 @@ msgstr "Szerver"
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 #, fuzzy
 msgid "Password Change"
 msgstr "Jelszó:"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 #, fuzzy
 msgid "Email Change"
 msgstr "Változtatás"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "A tag előléptetése sikeres."
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Regisztráció megszüntetése"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1564
+#: src/client.cpp:1587
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Helytelen frissítési kiszolgáló: "
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -310,11 +311,11 @@ msgstr ""
 "Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", "
 "\"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Általános"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
@@ -354,21 +355,26 @@ msgstr "Nem lehet betölteni a térképet"
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Csapat (%s)"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, fuzzy, c-format
 msgid "Guild: %s"
 msgstr "Klánok"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
+#: src/gui/beingpopup.cpp:146
+#, fuzzy, c-format
+msgid "Comment: %s"
+msgstr "Parancs: /list"
+
 #: src/gui/botcheckerwindow.cpp:265
 #, fuzzy
 msgid "Bot Checker"
@@ -378,19 +384,19 @@ msgstr "Chat Ablak"
 msgid "Name"
 msgstr "Név"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Támadás"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Csevegés"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 #, fuzzy
 msgid "Move"
 msgstr "Mozgás felfelé"
@@ -404,9 +410,9 @@ msgid "Reset"
 msgstr "Alaphelyzet"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Vétel"
 
@@ -450,9 +456,9 @@ msgstr "Max."
 msgid "Shop"
 msgstr "Üzlet"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Eladás"
@@ -460,15 +466,15 @@ msgstr "Eladás"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -741,7 +747,7 @@ msgstr "Szivárvány"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
@@ -763,10 +769,10 @@ msgstr "Igen"
 msgid "No"
 msgstr "Nem"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 #, fuzzy
 msgid "Ignore"
 msgstr "Tiltott"
@@ -928,7 +934,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Bezár"
 
@@ -958,8 +964,8 @@ msgstr "Felszerelés"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Nem használ"
 
@@ -1000,32 +1006,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Használ"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Bevet"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 #, fuzzy
 msgid "Drop..."
 msgstr "Eldob"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Felosztás"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr ""
 
@@ -1034,17 +1040,17 @@ msgid "Weight:"
 msgstr "Súly:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Eldob"
@@ -1290,7 +1296,7 @@ msgstr "Küldés"
 msgid "NPC"
 msgstr "Gépjátékos"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 #, fuzzy
 msgid "Clear"
 msgstr "Szálfegyver"
@@ -1331,333 +1337,348 @@ msgstr "Nem használ"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Üzlet"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Privát üzenet"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 #, fuzzy
 msgid "Be friend"
 msgstr "Barát"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 #, fuzzy
 msgid "Disregard"
 msgstr "Semmibevett"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 #, fuzzy
 msgid "Unignore"
 msgstr "Tiltott"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 #, fuzzy
 msgid "Completely ignore"
 msgstr "@@ignore|Teljesen letiltod %s-t@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 #, fuzzy
 msgid "Follow"
 msgstr "alacsony"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "Imitation"
 msgstr "Email cím módosírása"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 #, fuzzy
 msgid "Invite to party"
 msgstr "/party > Felhasználó csapatba hívása"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 #, fuzzy
 msgid "Kick from party"
 msgstr "@@admin-kick|Játékos kirúgása@@"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 #, fuzzy
 msgid "Kick from guild"
 msgstr "@@admin-kick|Játékos kirúgása@@"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 #, fuzzy
 msgid "Change pos in guild"
 msgstr "Változtatás"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 #, fuzzy
 msgid "Invite to guild"
 msgstr "/party > Felhasználó csapatba hívása"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 #, fuzzy
 msgid "Kick player"
 msgstr "Kirúgás sikertelen!"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 #, fuzzy
 msgid "Show Items"
 msgstr "A név mutatása"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 #, fuzzy
 msgid "Add to priority attack list"
 msgstr "@@attack|%s megtámadása@@"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 #, fuzzy
 msgid "Add to attack list"
 msgstr "@@attack|%s megtámadása@@"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 #, fuzzy
 msgid "Add to ignore list"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 #, fuzzy
 msgid "Pick up"
 msgstr "Felvesz"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "Rename"
 msgstr "Felhasználónév megjegyzése"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 #, fuzzy
 msgid "Remove"
 msgstr "Felhasználónév megjegyzése"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Kijelölt fül"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Kijelölt fül"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "Remove name"
 msgstr "Felhasználónév megjegyzése"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 #, fuzzy
 msgid "Enable away"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "Disable away"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 #, fuzzy
 msgid "Leave"
 msgstr "Nagy"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 #, fuzzy
 msgid "Change guild position"
 msgstr "Változtatás"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 #, fuzzy
 msgid "Store 10"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 #, fuzzy
 msgid "Store half"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 #, fuzzy
 msgid "Store all"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Drop all"
 msgstr "Eldob"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 #, fuzzy
 msgid "Copy to chat"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 #, fuzzy
 msgid "(default)"
 msgstr "Alapértelmezett"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 #, fuzzy
 msgid "Move up"
 msgstr "Mozgás felfelé"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 #, fuzzy
 msgid "Move down"
 msgstr "Mozgás lefelé"
@@ -1820,125 +1841,123 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
 #, fuzzy
 msgid "Enable trade tab"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 #, fuzzy
 msgid "Enable battle tab"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 #, fuzzy
 msgid "Show battle events"
 msgstr "A név mutatása"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 #, fuzzy
 msgid "Resize chat tabs if need"
 msgstr "Következő Chat Fül"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Így fog kinézni a felirat."
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Színek"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 #, fuzzy
 msgid "Type:"
 msgstr "Típus: "
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Statikus"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulzáló"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Szivárvány"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Színkép"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 #, fuzzy
 msgid "Delay:"
 msgstr "Várakozás "
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 #, fuzzy
 msgid "Red:"
 msgstr "Vörös: "
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 #, fuzzy
 msgid "Green:"
 msgstr "Zöld: "
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 #, fuzzy
 msgid "Blue:"
 msgstr "Kék: "
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
@@ -1950,6 +1969,11 @@ msgstr "Alkalmaz"
 msgid "Reset Windows"
 msgstr "Ablakok alaphelyzetbe"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Nyomd meg a gombot a kalibrálás megkezdéséhez"
@@ -1995,129 +2019,125 @@ msgstr "Alapértelmezett"
 msgid "Key Conflict(s) Detected."
 msgstr "Billentyű ütközés van."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:49
 #, fuzzy
-msgid "Highlight map portals"
-msgstr "Kijelölt"
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr ""
+msgid "Enable server side attack"
+msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:58
 #, fuzzy
-msgid "Cycle monster targets"
-msgstr "A név mutatása"
+msgid "Highlight map portals"
+msgstr "Kijelölt"
 
-#: src/gui/setup_other.cpp:135
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Joystick engedélyezése"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Kijelölt"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr ""
-
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:67
 #, fuzzy
-msgid "Enable shop mode"
-msgstr "Üzletelés Engedélyezése/Tiltása"
+msgid "Enable quick stats"
+msgstr "Joystick engedélyezése"
 
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:73
 #, fuzzy
-msgid "Enable debug log"
-msgstr "Nem tudod megvenni."
-
-#: src/gui/setup_other.cpp:161
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Nem tudod megvenni."
+msgid "Show warps particles"
+msgstr "Karakter felett"
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Joystick engedélyezése"
-
-#: src/gui/setup_other.cpp:173
-#, fuzzy
-msgid "Show warps particles"
-msgstr "Karakter felett"
-
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+#, fuzzy
+msgid "Cycle monster targets"
+msgstr "A név mutatása"
+
+#: src/gui/setup_other.cpp:92
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "A név mutatása"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+#, fuzzy
+msgid "Enable bot checker"
+msgstr "Joystick engedélyezése"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+#, fuzzy
+msgid "Afk message"
+msgstr "Üzenet"
+
+#: src/gui/setup_other.cpp:114
 #, fuzzy
 msgid "Enable attack filter"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+#, fuzzy
+msgid "Enable shop mode"
+msgstr "Üzletelés Engedélyezése/Tiltása"
+
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
+#: src/gui/setup_other.cpp:123
 #, fuzzy
-msgid "Afk message"
-msgstr "Üzenet"
+msgid "Enable debug log"
+msgstr "Nem tudod megvenni."
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2512,12 +2532,12 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Üzleti ajánlat"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, fuzzy, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s üzletelni akar veled. Te akarsz vele?"
@@ -4401,7 +4421,7 @@ msgstr "Öröm volt veled üzletet kötni!"
 msgid "Unable to buy."
 msgstr "Nem tudod megvenni."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Erő"
 
@@ -4410,7 +4430,7 @@ msgstr "Erő"
 msgid "Strength %+.1f"
 msgstr "Erő %+d"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Mozgékonyság"
 
@@ -4419,7 +4439,7 @@ msgstr "Mozgékonyság"
 msgid "Agility %+.1f"
 msgstr "Mozgékonyság %+d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Ügyesség"
 
@@ -4428,7 +4448,7 @@ msgstr "Ügyesség"
 msgid "Dexterity %+.1f"
 msgstr "Ügyesség %+d"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Egészség"
 
@@ -4437,7 +4457,7 @@ msgstr "Egészség"
 msgid "Vitality %+.1f"
 msgstr "Egészség %+d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Intelligencia"
 
@@ -5004,55 +5024,55 @@ msgstr "Duplikált bejelentkezés"
 msgid "Unknown connection error."
 msgstr "Ismeretlen kapcsolati hiba"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Lekapcsolódtál a szerverről!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Szerencse"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 #, fuzzy
 msgid "Defense"
 msgstr "Fizikális védelem:"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 #, fuzzy
 msgid "M.Attack"
 msgstr "Mágikus támadás:"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 #, fuzzy
 msgid "M.Defense"
 msgstr "Mágikus védelem:"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 #, fuzzy
 msgid "% Accuracy"
 msgstr "Találati esély (%):"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 #, fuzzy
 msgid "% Evade"
 msgstr "Kitérés (%):"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 #, fuzzy
 msgid "% Critical"
 msgstr "Kritikális ütéskor"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Támadás %+d"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Támadás %+d"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 #, fuzzy
 msgid "Attack Range"
 msgstr "Sérüléskor"
@@ -5945,9 +5965,6 @@ msgstr "Ismeretlen tárgy"
 #~ msgid "If <channel> doesn't exist, it's created."
 #~ msgstr "Ha a <csatorna> helyen megadott csatorna nem létezik, létrehozod."
 
-#~ msgid "Command: /list"
-#~ msgstr "Parancs: /list"
-
 #~ msgid "This command shows a list of all channels."
 #~ msgstr "Kilistázza az összes csatornát."
 
diff --git a/po/it.po b/po/it.po
index 73859a310..7a30451da 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
-"PO-Revision-Date: 2011-06-11 17:16+0000\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
+"PO-Revision-Date: 2011-06-20 00:31+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"
@@ -23,43 +23,43 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr "Mancato"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 msgid "Logging in"
 msgstr "Accesso"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 msgid "Requesting characters"
 msgstr "Ricerca personaggi"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -69,49 +69,50 @@ msgstr "Cambiamento server del gioco"
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 msgid "Password Change"
 msgstr "Cambiamento password"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 msgid "Email Change"
 msgstr "Cambio Email"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, 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:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, 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."
@@ -289,11 +290,11 @@ msgstr ""
 "Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" "
 "(falso), \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Generale"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Debug"
 
@@ -330,21 +331,26 @@ msgstr "Impossibile caricare la mappa."
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
 msgstr "Party: %s"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilda: %s"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Rango PvP: %d"
 
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
 #: src/gui/botcheckerwindow.cpp:265
 msgid "Bot Checker"
 msgstr "Bot Checker"
@@ -353,19 +359,19 @@ msgstr "Bot Checker"
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Attacco"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Parla"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 msgid "Move"
 msgstr "Movimento"
 
@@ -378,9 +384,9 @@ msgid "Reset"
 msgstr "Reimposta"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Compra"
 
@@ -424,9 +430,9 @@ msgstr "Massimo"
 msgid "Shop"
 msgstr "Negozio"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Vendi"
@@ -434,15 +440,15 @@ msgstr "Vendi"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -695,7 +701,7 @@ msgstr "Arcobaleno 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
@@ -717,10 +723,10 @@ msgstr "Sì"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -865,7 +871,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Chiudi"
 
@@ -893,8 +899,8 @@ msgstr "Equipaggiamento"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Togli"
 
@@ -932,31 +938,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Equipaggia"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Usa"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
 msgstr "Lascia..."
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Dividi"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr "Attrezzatura"
 
@@ -965,17 +971,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Magazzino"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Lascia"
@@ -1210,7 +1216,7 @@ msgstr "Invia"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 msgid "Clear"
 msgstr "Cancella"
 
@@ -1248,291 +1254,306 @@ msgstr "Rimuovi prima"
 msgid "Away outfit"
 msgstr "Away outfit"
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Commercia"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Spells"
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr "Nome:"
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 msgid "Store 10"
 msgstr "Salva 10"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 msgid "Store half"
 msgstr "Salva metà"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 msgid "Store all"
 msgstr "Salva tutto"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr "Carica vecchie scorciatoie oggetti"
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr "Carica vecchie scorciatoie drop"
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 msgid "Move down"
 msgstr ""
 
@@ -1688,116 +1709,114 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Ingenieria suono"
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr "Rimuovi colori dei messaggi ricevuti in chat"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr "Salva i messaggi delle magie nella debug tab"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Autorizza i comandi delle magie e dei GM per tutte le tabelle di chat"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
-msgid "Enable chat Log"
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:92
-msgid "Enable trade tab"
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
-msgid "Hide shop messages"
+#: src/gui/setup_chat.cpp:73
+msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:100
-msgid "Show chat history"
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
-msgid "Enable battle tab"
+#: src/gui/setup_chat.cpp:79
+msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
-msgid "Show battle events"
+#: src/gui/setup_chat.cpp:82
+msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:85
+msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
+#: src/gui/setup_chat.cpp:88
+msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
+#: src/gui/setup_chat.cpp:91
+msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
+#: src/gui/setup_chat.cpp:94
+msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:134
-msgid "Resize chat tabs if need"
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Come appaiono i colori"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Colori"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Statico"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulsazione"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Arcobaleno"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Gamma"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
@@ -1809,6 +1828,11 @@ msgstr "Applica"
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
@@ -1853,116 +1877,112 @@ msgstr "Predefinito"
 msgid "Key Conflict(s) Detected."
 msgstr "Sono stati rilevati conflitti nei tasti."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
-msgid "Highlight map portals"
-msgstr ""
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
-msgid "Cycle monster targets"
+#: src/gui/setup_other.cpp:58
+msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
-msgid "Enable bot checker"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr ""
-
-#: src/gui/setup_other.cpp:152
-msgid "Enable shop mode"
+#: src/gui/setup_other.cpp:67
+msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
-msgid "Enable debug log"
+#: src/gui/setup_other.cpp:73
+msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
-msgid "Enable server side attack"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-msgid "Enable quick stats"
+#: src/gui/setup_other.cpp:86
+msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
-msgid "Show warps particles"
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:92
+msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
-msgid "Show own hp bar"
+#: src/gui/setup_other.cpp:98
+msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
-msgid "Afk message"
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
 msgstr ""
 
 #: src/gui/setup_players.cpp:65
@@ -2330,12 +2350,12 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -4109,7 +4129,7 @@ msgstr "Grazie per l'acquisto."
 msgid "Unable to buy."
 msgstr "Impossibile acquistare."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Forza"
 
@@ -4118,7 +4138,7 @@ msgstr "Forza"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Agilità"
 
@@ -4127,7 +4147,7 @@ msgstr "Agilità"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Destrezza"
 
@@ -4136,7 +4156,7 @@ msgstr "Destrezza"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Vitalità"
 
@@ -4145,7 +4165,7 @@ msgstr "Vitalità"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Intelligenza"
 
@@ -4671,47 +4691,47 @@ msgstr ""
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Disconnesso dal server!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Fortuna"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Range"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index b4580eb3d..44f40d8b9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
-"PO-Revision-Date: 2011-06-11 17:16+0000\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
+"PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -24,43 +24,43 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr "ミス"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 msgid "Connecting to server"
 msgstr "サーバー通信中…"
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 msgid "Logging in"
 msgstr "ログイン中…"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr "ゲームの世界に入る中"
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 msgid "Requesting characters"
 msgstr "服：％d"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 msgid "Connecting to the game server"
 msgstr "ゲームサーバー通信中…"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Changing game servers"
 msgstr "サーバーを入り替え中…"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -70,49 +70,50 @@ msgstr "サーバーを入り替え中…"
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr "登録細目を要請中"
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr "パスワード変更成功！"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 msgid "Email Change"
 msgstr "メール変更"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr "メール変更成功！"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 msgid "Unregister Successful"
 msgstr "登録解除成功"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr "さよなら、いつでも戻ってね..."
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s は存在しないので作成することが不可能！終了中…"
 
-#: src/client.cpp:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:  %s"
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー： %s は存在しないので作成することが不可能！終了中…"
@@ -281,11 +282,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"。"
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "デバッグ"
 
@@ -322,21 +323,26 @@ msgstr "マップをロードできませんでした"
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
 msgstr "パーティ：%s"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, c-format
 msgid "Guild: %s"
 msgstr "ギルド：%s"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "PVP ランク：%d"
 
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
 #: src/gui/botcheckerwindow.cpp:265
 msgid "Bot Checker"
 msgstr "ボット"
@@ -345,19 +351,19 @@ msgstr "ボット"
 msgid "Name"
 msgstr "名前"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "攻撃"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "話す"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 msgid "Move"
 msgstr "動く"
 
@@ -370,9 +376,9 @@ msgid "Reset"
 msgstr "リセット"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "買う"
 
@@ -416,9 +422,9 @@ msgstr "最大"
 msgid "Shop"
 msgstr "店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "売る"
@@ -426,15 +432,15 @@ msgstr "売る"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -687,7 +693,7 @@ msgstr "虹 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "チャット"
 
@@ -709,10 +715,10 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 msgid "Ignore"
 msgstr "無視"
 
@@ -857,7 +863,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "閉じる"
 
@@ -885,8 +891,8 @@ msgstr "装備"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "外す"
 
@@ -924,31 +930,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "装備する"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "使う"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
 msgstr "落とす..."
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "分割する"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr "服"
 
@@ -957,17 +963,17 @@ msgid "Weight:"
 msgstr "重量"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "保存"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "取り戻す"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "落とす"
@@ -1200,7 +1206,7 @@ msgstr "決定"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 msgid "Clear"
 msgstr "クリア"
 
@@ -1238,291 +1244,306 @@ msgstr "外す第一"
 msgid "Away outfit"
 msgstr "装備一式不在で"
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交換"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "完全無視"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr "チャットに追加"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr "マップアイテム"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 msgid "Remove"
 msgstr "取り去る"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "呪文"
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "でる"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr " 名前:   "
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 msgid "Add to trade"
 msgstr "に貿易を足す"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 msgid "Store 10"
 msgstr "10保存"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 msgid "Store half"
 msgstr "半分保存"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 msgid "Store all"
 msgstr "全部保存"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 msgid "Retrieve 10"
 msgstr "10取る"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 msgid "Retrieve half"
 msgstr "半分取る"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 msgid "Retrieve all"
 msgstr "全部取る"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr " 隠す"
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr "見せる"
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 msgid "Move down"
 msgstr ""
 
@@ -1676,116 +1697,114 @@ msgstr "新しい音楽をダウンロードする場合は、クライアント
 msgid "Sound Engine"
 msgstr "サウンドエンジン"
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr "チャットログを有効"
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 msgid "Enable battle tab"
 msgstr "バトルタブを有効"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr "エディット"
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
+#: src/gui/setup_chat.cpp:94
+msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:134
-msgid "Resize chat tabs if need"
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "これがその色がどのように見えるかです。"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "色彩"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "タイプ："
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "穏やか"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "点滅"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "カラフル"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "スペクトル"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr "遅延："
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr "赤"
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr "緑"
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr "青"
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr "アルファ："
 
@@ -1797,6 +1816,11 @@ msgstr "適用"
 msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr "エディット"
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "ボタンを押すと較正が始まります。"
@@ -1841,118 +1865,114 @@ msgstr "標準に戻す"
 msgid "Key Conflict(s) Detected."
 msgstr "キーが重複しています。"
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr "他"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "モンスターに与えた損傷を表示する"
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
-msgid "Highlight map portals"
-msgstr ""
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
-msgid "Cycle monster targets"
+#: src/gui/setup_other.cpp:58
+msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
-msgid "Enable bot checker"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr ""
-
-#: src/gui/setup_other.cpp:152
-msgid "Enable shop mode"
-msgstr ""
-
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
-msgstr ""
-
-#: src/gui/setup_other.cpp:158
-msgid "Enable debug log"
-msgstr "デバッグループを有効にする"
-
-#: src/gui/setup_other.cpp:161
-msgid "Enable server side attack"
+#: src/gui/setup_other.cpp:67
+msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:73
+msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-msgid "Enable quick stats"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
-msgid "Show warps particles"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr "モンスターHPバーを表示する"
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
 msgid "Show own hp bar"
 msgstr "自分のHPバーを表示する"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
-msgid "Afk message"
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
 msgstr ""
 
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
+msgstr "デバッグループを有効にする"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "関係"
@@ -2318,12 +2338,12 @@ msgstr "発表する"
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "取引要求"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -4092,7 +4112,7 @@ msgstr "買ってくださり、ありがとうございました。"
 msgid "Unable to buy."
 msgstr "購買不可能"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "強さ"
 
@@ -4101,7 +4121,7 @@ msgstr "強さ"
 msgid "Strength %+.1f"
 msgstr "強度 (str) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "素早さ"
 
@@ -4110,7 +4130,7 @@ msgstr "素早さ"
 msgid "Agility %+.1f"
 msgstr "機敏さ (agi) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "器用さ"
 
@@ -4119,7 +4139,7 @@ msgstr "器用さ"
 msgid "Dexterity %+.1f"
 msgstr "器用さ (dex) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "活力"
 
@@ -4128,7 +4148,7 @@ msgstr "活力"
 msgid "Vitality %+.1f"
 msgstr "活気 (vit) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "知能"
 
@@ -4647,47 +4667,47 @@ msgstr "重複しログイン。"
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "サーバーから切断された。"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "運"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 msgid "Defense"
 msgstr "防御"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "M.Attack"
 msgstr "特攻撃"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Defense"
 msgstr "特防御"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "% Accuracy"
 msgstr "％ 精度"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "% Evade"
 msgstr "％ 回避"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "% Critical"
 msgstr "% 危機"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "Attack Delay"
 msgstr "攻撃遅延"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Walk Delay"
 msgstr " 徒歩遅延"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Range"
 msgstr "攻撃距離"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index fd22f3588..bfb5e458f 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-06-11 20:15+0300\n"
+"POT-Creation-Date: 2011-06-20 03:19+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"
@@ -22,43 +22,43 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -68,49 +68,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -284,11 +285,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
@@ -325,21 +326,26 @@ msgstr ""
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
 #: src/gui/botcheckerwindow.cpp:265
 msgid "Bot Checker"
 msgstr ""
@@ -348,19 +354,19 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 msgid "Move"
 msgstr ""
 
@@ -373,9 +379,9 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr ""
 
@@ -419,9 +425,9 @@ msgstr ""
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr ""
@@ -429,15 +435,15 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -690,7 +696,7 @@ msgstr ""
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr ""
 
@@ -712,10 +718,10 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 msgid "Ignore"
 msgstr ""
 
@@ -860,7 +866,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr ""
 
@@ -888,8 +894,8 @@ msgstr ""
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr ""
 
@@ -927,31 +933,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr ""
 
@@ -960,17 +966,17 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
@@ -1205,7 +1211,7 @@ msgstr ""
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 msgid "Clear"
 msgstr ""
 
@@ -1243,291 +1249,306 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 msgid "Move down"
 msgstr ""
 
@@ -1681,116 +1702,114 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
-msgid "Enable chat Log"
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:92
-msgid "Enable trade tab"
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
-msgid "Hide shop messages"
+#: src/gui/setup_chat.cpp:73
+msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:100
-msgid "Show chat history"
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
-msgid "Enable battle tab"
+#: src/gui/setup_chat.cpp:79
+msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
-msgid "Show battle events"
+#: src/gui/setup_chat.cpp:82
+msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:85
+msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
+#: src/gui/setup_chat.cpp:88
+msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
+#: src/gui/setup_chat.cpp:91
+msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
+#: src/gui/setup_chat.cpp:94
+msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:134
-msgid "Resize chat tabs if need"
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
@@ -1802,6 +1821,11 @@ msgstr ""
 msgid "Reset Windows"
 msgstr ""
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
@@ -1846,116 +1870,112 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
-msgid "Highlight map portals"
-msgstr ""
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
-msgid "Cycle monster targets"
+#: src/gui/setup_other.cpp:58
+msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
-msgid "Enable bot checker"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr ""
-
-#: src/gui/setup_other.cpp:152
-msgid "Enable shop mode"
+#: src/gui/setup_other.cpp:67
+msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
-msgid "Enable debug log"
+#: src/gui/setup_other.cpp:73
+msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
-msgid "Enable server side attack"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-msgid "Enable quick stats"
+#: src/gui/setup_other.cpp:86
+msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
-msgid "Show warps particles"
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:92
+msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
-msgid "Show own hp bar"
+#: src/gui/setup_other.cpp:98
+msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
-msgid "Afk message"
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
 msgstr ""
 
 #: src/gui/setup_players.cpp:65
@@ -2323,12 +2343,12 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -4096,7 +4116,7 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr ""
 
@@ -4105,7 +4125,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr ""
 
@@ -4114,7 +4134,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr ""
 
@@ -4123,7 +4143,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr ""
 
@@ -4132,7 +4152,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr ""
 
@@ -4651,47 +4671,47 @@ msgstr ""
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Range"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 957660f8b..764dd6f89 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -24,48 +24,48 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Zichtbare namen"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Verbinden met de map server..."
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 #, fuzzy
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Kies Personage"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Verbinden met de map server..."
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -75,53 +75,54 @@ msgstr "Server"
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 #, fuzzy
 msgid "Password Change"
 msgstr "Wachtwoord:"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 #, fuzzy
 msgid "Email Change"
 msgstr "Veranderen"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Lid is succesvol gepromoveerd."
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Registreren"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1564
+#: src/client.cpp:1587
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige updatahost: "
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -307,11 +308,11 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
@@ -353,21 +354,26 @@ msgstr "Kan de map niet laden"
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Groep (%s)"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, fuzzy, c-format
 msgid "Guild: %s"
 msgstr "Guilds"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
+#: src/gui/beingpopup.cpp:146
+#, fuzzy, c-format
+msgid "Comment: %s"
+msgstr "Commando: /list"
+
 #: src/gui/botcheckerwindow.cpp:265
 #, fuzzy
 msgid "Bot Checker"
@@ -377,19 +383,19 @@ msgstr "Gespreksvenster"
 msgid "Name"
 msgstr "Naam"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Spreken"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 #, fuzzy
 msgid "Move"
 msgstr "Omhoog"
@@ -403,9 +409,9 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Kopen"
 
@@ -449,9 +455,9 @@ msgstr "Maximum"
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Verkopen"
@@ -459,15 +465,15 @@ msgstr "Verkopen"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -740,7 +746,7 @@ msgstr "Regenboog"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
@@ -762,10 +768,10 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 #, fuzzy
 msgid "Ignore"
 msgstr "Genegeerd"
@@ -927,7 +933,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Sluiten"
 
@@ -957,8 +963,8 @@ msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -999,32 +1005,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 #, fuzzy
 msgid "Drop..."
 msgstr "Neerleggen"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Splitsen"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr ""
 
@@ -1033,17 +1039,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1289,7 +1295,7 @@ msgstr "Indienen"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 #, fuzzy
 msgid "Clear"
 msgstr "Sluiten"
@@ -1330,329 +1336,344 @@ msgstr "Afdoen"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Fluister"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 #, fuzzy
 msgid "Be friend"
 msgstr "Vriend"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 #, fuzzy
 msgid "Unignore"
 msgstr "Genegeerd"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 #, fuzzy
 msgid "Completely ignore"
 msgstr "Voltooid"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 #, fuzzy
 msgid "Follow"
 msgstr "laag"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "Imitation"
 msgstr "Emailadres wijzigen"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 #, fuzzy
 msgid "Invite to party"
 msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 #, fuzzy
 msgid "Kick from party"
 msgstr "Kick gefaald!"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 #, fuzzy
 msgid "Kick from guild"
 msgstr "Kick gefaald!"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 #, fuzzy
 msgid "Change pos in guild"
 msgstr "Veranderen"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 #, fuzzy
 msgid "Invite to guild"
 msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 #, fuzzy
 msgid "Kick player"
 msgstr "Kick gefaald!"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 #, fuzzy
 msgid "Show Items"
 msgstr "Naam tonen"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 #, fuzzy
 msgid "Add to priority attack list"
 msgstr "@@attack|%s aanvallen@@"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 #, fuzzy
 msgid "Add to attack list"
 msgstr "@@attack|%s aanvallen@@"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 #, fuzzy
 msgid "Add to ignore list"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 #, fuzzy
 msgid "Pick up"
 msgstr "Oprapen"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "Rename"
 msgstr "Onthoud Naam"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 #, fuzzy
 msgid "Remove"
 msgstr "Onthoud Naam"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Tab Accentuering"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Tab Accentuering"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "Remove name"
 msgstr "Onthoud Naam"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 #, fuzzy
 msgid "Enable away"
 msgstr "Kan niets kopen."
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "Disable away"
 msgstr "Handelen inschakelen/uitschakelen"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 #, fuzzy
 msgid "Leave"
 msgstr "Groot"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 #, fuzzy
 msgid "Change guild position"
 msgstr "Veranderen"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 #, fuzzy
 msgid "Add to trade"
 msgstr "Handel goedkeuren"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 #, fuzzy
 msgid "Store 10"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 #, fuzzy
 msgid "Store half"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 #, fuzzy
 msgid "Store all"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Drop all"
 msgstr "Neerleggen"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 #, fuzzy
 msgid "(default)"
 msgstr "Standaard"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 #, fuzzy
 msgid "Move up"
 msgstr "Omhoog"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 #, fuzzy
 msgid "Move down"
 msgstr "Omlaag"
@@ -1815,125 +1836,123 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
 #, fuzzy
 msgid "Enable trade tab"
 msgstr "Kan niets kopen."
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 #, fuzzy
 msgid "Enable battle tab"
 msgstr "Kan niets kopen."
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 #, fuzzy
 msgid "Show battle events"
 msgstr "Naam tonen"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 #, fuzzy
 msgid "Resize chat tabs if need"
 msgstr "Volgende chattab"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 #, fuzzy
 msgid "Type:"
 msgstr "Type: "
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Statisch"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Regenboog"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 #, fuzzy
 msgid "Delay:"
 msgstr "Vertraging: "
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 #, fuzzy
 msgid "Red:"
 msgstr "Rood: "
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 #, fuzzy
 msgid "Green:"
 msgstr "Groen: "
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 #, fuzzy
 msgid "Blue:"
 msgstr "Blauw: "
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
@@ -1945,6 +1964,11 @@ msgstr "Toepassen"
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
@@ -1990,129 +2014,125 @@ msgstr "Standaard"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:49
 #, fuzzy
-msgid "Highlight map portals"
-msgstr "Accentueren"
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr ""
+msgid "Enable server side attack"
+msgstr "Kan niets kopen."
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:58
 #, fuzzy
-msgid "Cycle monster targets"
-msgstr "Naam tonen"
+msgid "Highlight map portals"
+msgstr "Accentueren"
 
-#: src/gui/setup_other.cpp:135
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Joystick activeren"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Accentueren"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr ""
-
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:67
 #, fuzzy
-msgid "Enable shop mode"
-msgstr "Handelen inschakelen/uitschakelen"
+msgid "Enable quick stats"
+msgstr "Joystick activeren"
 
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:73
 #, fuzzy
-msgid "Enable debug log"
-msgstr "Kan niets kopen."
-
-#: src/gui/setup_other.cpp:161
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Kan niets kopen."
+msgid "Show warps particles"
+msgstr "als deeltje"
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Joystick activeren"
-
-#: src/gui/setup_other.cpp:173
-#, fuzzy
-msgid "Show warps particles"
-msgstr "als deeltje"
-
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+#, fuzzy
+msgid "Cycle monster targets"
+msgstr "Naam tonen"
+
+#: src/gui/setup_other.cpp:92
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Naam tonen"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+#, fuzzy
+msgid "Enable bot checker"
+msgstr "Joystick activeren"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+#, fuzzy
+msgid "Afk message"
+msgstr "Bericht"
+
+#: src/gui/setup_other.cpp:114
 #, fuzzy
 msgid "Enable attack filter"
 msgstr "Kan niets kopen."
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+#, fuzzy
+msgid "Enable shop mode"
+msgstr "Handelen inschakelen/uitschakelen"
+
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
+#: src/gui/setup_other.cpp:123
 #, fuzzy
-msgid "Afk message"
-msgstr "Bericht"
+msgid "Enable debug log"
+msgstr "Kan niets kopen."
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2507,12 +2527,12 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, fuzzy, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s wil met jou handelen, aanvaard je dit?"
@@ -4399,7 +4419,7 @@ msgstr "Bedankt voor de aankopen."
 msgid "Unable to buy."
 msgstr "Kan niets kopen."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Kracht"
 
@@ -4408,7 +4428,7 @@ msgstr "Kracht"
 msgid "Strength %+.1f"
 msgstr "Kracht %+d"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Behendigheid"
 
@@ -4417,7 +4437,7 @@ msgstr "Behendigheid"
 msgid "Agility %+.1f"
 msgstr "Behandigheid %+d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Vaardigheid"
 
@@ -4426,7 +4446,7 @@ msgstr "Vaardigheid"
 msgid "Dexterity %+.1f"
 msgstr "Vaardigheid %+d"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Vitaliteit"
 
@@ -4435,7 +4455,7 @@ msgstr "Vitaliteit"
 msgid "Vitality %+.1f"
 msgstr "Vitaliteit %+d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Intelligentie"
 
@@ -5005,55 +5025,55 @@ msgstr "Dubbele login"
 msgid "Unknown connection error."
 msgstr "Onbekenden connectiefout"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Geluk"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 #, fuzzy
 msgid "Defense"
 msgstr "Verdediging:"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 #, fuzzy
 msgid "M.Attack"
 msgstr "Magische Aanval:"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 #, fuzzy
 msgid "M.Defense"
 msgstr "Magische Verdediging:"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 #, fuzzy
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid:"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 #, fuzzy
 msgid "% Evade"
 msgstr "% Ontwijking:"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 #, fuzzy
 msgid "% Critical"
 msgstr "Kritieke aanval"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Aanval %+d"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Aanval %+d"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 #, fuzzy
 msgid "Attack Range"
 msgstr "Monster raakt Speler"
@@ -5914,9 +5934,6 @@ msgstr "Onbekend voorwerp"
 #~ msgid "If <channel> doesn't exist, it's created."
 #~ msgstr "Als <kanaal> niet bestaat, wordt het aangemaakt."
 
-#~ msgid "Command: /list"
-#~ msgstr "Commando: /list"
-
 #~ msgid "This command shows a list of all channels."
 #~ msgstr "Dit commando geeft een lijst weer van alle kanalen."
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 18d7af8f7..e182b7846 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
-"PO-Revision-Date: 2011-06-11 17:16+0000\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
+"PO-Revision-Date: 2011-06-20 00:31+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"
 "MIME-Version: 1.0\n"
@@ -22,43 +22,43 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr "mist"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -68,49 +68,50 @@ msgstr "Wijzigen spelservers"
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, 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:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, 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."
@@ -286,11 +287,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Debug"
 
@@ -327,21 +328,26 @@ msgstr "Kon Map Niet Laden"
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
 msgstr "Groep: %s"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilde: %s"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Pvp rang: %d"
 
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
 #: src/gui/botcheckerwindow.cpp:265
 msgid "Bot Checker"
 msgstr "Bot Controleerder"
@@ -350,19 +356,19 @@ msgstr "Bot Controleerder"
 msgid "Name"
 msgstr "Naam"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Spreken"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 msgid "Move"
 msgstr "Beweeg"
 
@@ -375,9 +381,9 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Kopen"
 
@@ -421,9 +427,9 @@ msgstr "Maximum"
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Verkopen"
@@ -431,15 +437,15 @@ msgstr "Verkopen"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -692,7 +698,7 @@ msgstr "regenboog 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
@@ -714,10 +720,10 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 msgid "Ignore"
 msgstr "Negeer"
 
@@ -862,7 +868,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Sluiten"
 
@@ -890,8 +896,8 @@ msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -929,31 +935,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
 msgstr "Neerleggen..."
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Splitsen"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr "Kleren"
 
@@ -962,17 +968,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1207,7 +1213,7 @@ msgstr "Indienen"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 msgid "Clear"
 msgstr "Wissen"
 
@@ -1245,291 +1251,306 @@ msgstr "Verwijder uitrusting eerst"
 msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Spreuken"
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Verlaat"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr "Naam:                    "
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 msgid "Store 10"
 msgstr "Plaats 10"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 msgid "Store half"
 msgstr "Plaats de helft"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 msgid "Store all"
 msgstr "Plaats alles"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr "Laden van oude voorwerpsnelkoppelingen"
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr "Laden van oude neerleggingsnelkoppeling"
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 msgid "Move down"
 msgstr ""
 
@@ -1685,116 +1706,114 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Geluidsengine"
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr "Verwijder kleuren van ontvangen chat berichten"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr "Toon server berichten in de debug tab"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr "Toon chat kleurenlijst"
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr "Limiteer max karakters in chat lijn"
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr "Zet chat log aan"
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr "Limiteer max lijnen in chat"
+
+#: src/gui/setup_chat.cpp:79
 msgid "Enable trade tab"
 msgstr "Zet handle tab aan"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr "Verberg verkoop boodschappen"
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr "Toon chat geschiedenis"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr "Toon chat kleurenlijst"
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr "Wijzig"
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr "Limiteer max karakters in chat lijn"
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr "Limiteer max lijnen in chat"
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Type:"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Statisch"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Regenboog"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr "Rood:"
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr "Groen:"
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr "Blauw:"
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -1806,6 +1825,11 @@ msgstr "Toepassen"
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr "Wijzig"
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
@@ -1850,118 +1874,114 @@ msgstr "Standaard"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Toon aangebrachte schade aan monsters"
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
-msgid "Highlight map portals"
-msgstr ""
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
-msgid "Cycle monster targets"
+#: src/gui/setup_other.cpp:58
+msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
-msgid "Enable bot checker"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 msgid "Highlight floor items"
 msgstr "Markeer vloer voorwerpen"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
+#: src/gui/setup_other.cpp:67
+msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
-msgid "Enable shop mode"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:73
+msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
-msgid "Enable debug log"
-msgstr "Zet debug log aan"
-
-#: src/gui/setup_other.cpp:161
-msgid "Enable server side attack"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-msgid "Enable quick stats"
+#: src/gui/setup_other.cpp:86
+msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:173
-msgid "Show warps particles"
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:92
+msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
-msgid "Show monster hp bar"
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
-msgid "Show own hp bar"
+#: src/gui/setup_other.cpp:98
+msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
-msgid "Afk message"
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
 msgstr ""
 
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
+msgstr "Zet debug log aan"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relatie"
@@ -2329,12 +2349,12 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s wilt %s %s ga je akkoord?"
@@ -4112,7 +4132,7 @@ msgstr "Bedankt voor de aankopen."
 msgid "Unable to buy."
 msgstr "Kan niets kopen."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Kracht"
 
@@ -4121,7 +4141,7 @@ msgstr "Kracht"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Behendigheid"
 
@@ -4130,7 +4150,7 @@ msgstr "Behendigheid"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Vaardigheid"
 
@@ -4139,7 +4159,7 @@ msgstr "Vaardigheid"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Vitaliteit"
 
@@ -4148,7 +4168,7 @@ msgstr "Vitaliteit"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Intelligentie"
 
@@ -4674,47 +4694,47 @@ msgstr ""
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Geluk"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Range"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index f5e9a9c47..b736846e1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
 "PO-Revision-Date: 2009-09-14 06:59+0000\n"
 "Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -27,48 +27,48 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Widoczne imiona"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem map..."
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 #, fuzzy
 msgid "Logging in"
 msgstr "Użytkownik"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Wybierz postać"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Łączenie z serwerem map..."
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Serwer"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -78,53 +78,54 @@ msgstr "Serwer"
 msgid "Error"
 msgstr "Błąd"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 #, fuzzy
 msgid "Password Change"
 msgstr "Hasło:"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 #, fuzzy
 msgid "Email Change"
 msgstr "Zmień"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Członek został pomyślnie wypromowany."
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Wyrejestruj"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1564
+#: src/client.cpp:1587
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy host aktualizacji: "
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -317,11 +318,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
@@ -361,21 +362,26 @@ msgstr "Nie można załadować mapy"
 msgid "Error while loading %s"
 msgstr "Błąd podczas łądowania %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Grupa (%s)"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, fuzzy, c-format
 msgid "Guild: %s"
 msgstr "Gildie"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
+#: src/gui/beingpopup.cpp:146
+#, fuzzy, c-format
+msgid "Comment: %s"
+msgstr "Komenda: /list"
+
 #: src/gui/botcheckerwindow.cpp:265
 #, fuzzy
 msgid "Bot Checker"
@@ -385,19 +391,19 @@ msgstr "Okno Emotek"
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Atak"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Rozmowa"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 #, fuzzy
 msgid "Move"
 msgstr "Przesuń w górę"
@@ -411,9 +417,9 @@ msgid "Reset"
 msgstr "Resetuj"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Kup"
 
@@ -457,9 +463,9 @@ msgstr "Maks."
 msgid "Shop"
 msgstr "Sklep"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Sprzedaj"
@@ -467,15 +473,15 @@ msgstr "Sprzedaj"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -748,7 +754,7 @@ msgstr "Tęcza"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Czat"
 
@@ -770,10 +776,10 @@ msgstr "Tak"
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 #, fuzzy
 msgid "Ignore"
 msgstr "Ignorowany"
@@ -935,7 +941,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Zamknij"
 
@@ -965,8 +971,8 @@ msgstr "Ekwipunek"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Zdejmij"
 
@@ -1006,32 +1012,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Załóż"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Użyj"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 #, fuzzy
 msgid "Drop..."
 msgstr "Upuść"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Podziel"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr ""
 
@@ -1040,17 +1046,17 @@ msgid "Weight:"
 msgstr "Waga:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Przechowaj"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Upuść"
@@ -1297,7 +1303,7 @@ msgstr "Zatwierdź"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 #, fuzzy
 msgid "Clear"
 msgstr "Kij"
@@ -1338,333 +1344,348 @@ msgstr "Zdejmij"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Szept"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 #, fuzzy
 msgid "Be friend"
 msgstr "Przyjaciel"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 #, fuzzy
 msgid "Disregard"
 msgstr "Nielubiany"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 #, fuzzy
 msgid "Unignore"
 msgstr "Ignorowany"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 #, fuzzy
 msgid "Completely ignore"
 msgstr "@@ignore|Kompletnie ignoruj %s@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 #, fuzzy
 msgid "Follow"
 msgstr "niskie"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "Imitation"
 msgstr "Zmień adres Email"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 #, fuzzy
 msgid "Invite to party"
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 #, fuzzy
 msgid "Kick from party"
 msgstr "@@admin-kick|Wykop gracza@@"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 #, fuzzy
 msgid "Kick from guild"
 msgstr "@@admin-kick|Wykop gracza@@"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 #, fuzzy
 msgid "Change pos in guild"
 msgstr "Zmień"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 #, fuzzy
 msgid "Invite to guild"
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 #, fuzzy
 msgid "Kick player"
 msgstr "Wykopanie nie powiodło się!"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 #, fuzzy
 msgid "Show Items"
 msgstr "Pokaż imię"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 #, fuzzy
 msgid "Add to priority attack list"
 msgstr "@@attack|Atakuj %s@@"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 #, fuzzy
 msgid "Add to attack list"
 msgstr "@@attack|Atakuj %s@@"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 #, fuzzy
 msgid "Add to ignore list"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 #, fuzzy
 msgid "Pick up"
 msgstr "Podnieś"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "Rename"
 msgstr "Zapamiętaj użytkownika"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 #, fuzzy
 msgid "Remove"
 msgstr "Zapamiętaj użytkownika"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Podświetlenie zakładki"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Podświetlenie zakładki"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "Remove name"
 msgstr "Zapamiętaj użytkownika"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 #, fuzzy
 msgid "Enable away"
 msgstr "Nie można kupić."
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "Disable away"
 msgstr "Włącz/Wysłącz Handlowanie"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 #, fuzzy
 msgid "Leave"
 msgstr "Duża"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 #, fuzzy
 msgid "Change guild position"
 msgstr "Zmień"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 #, fuzzy
 msgid "Store 10"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 #, fuzzy
 msgid "Store half"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 #, fuzzy
 msgid "Store all"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Drop all"
 msgstr "Upuść"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 #, fuzzy
 msgid "Copy to chat"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 #, fuzzy
 msgid "(default)"
 msgstr "Domyślny"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 #, fuzzy
 msgid "Move up"
 msgstr "Przesuń w górę"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 #, fuzzy
 msgid "Move down"
 msgstr "Przesuń w dół"
@@ -1827,125 +1848,123 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
 #, fuzzy
 msgid "Enable trade tab"
 msgstr "Nie można kupić."
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 #, fuzzy
 msgid "Enable battle tab"
 msgstr "Nie można kupić."
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 #, fuzzy
 msgid "Show battle events"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 #, fuzzy
 msgid "Resize chat tabs if need"
 msgstr "Następna zakładka czatu"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Kolor będzie wyglądał w ten sposób"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 #, fuzzy
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Statyczny"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Tęcza"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Widmo"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 #, fuzzy
 msgid "Delay:"
 msgstr "Opóźnienie: "
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 #, fuzzy
 msgid "Red:"
 msgstr "Czerwony: "
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 #, fuzzy
 msgid "Green:"
 msgstr "Zielony: "
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 #, fuzzy
 msgid "Blue:"
 msgstr "Niebieski: "
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
@@ -1957,6 +1976,11 @@ msgstr "Zastosuj"
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Naciśnij przycisk aby rozpocząć kalibrację"
@@ -2002,129 +2026,125 @@ msgstr "Domyślny"
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:49
 #, fuzzy
-msgid "Highlight map portals"
-msgstr "Podświetlenie"
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr ""
+msgid "Enable server side attack"
+msgstr "Nie można kupić."
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:58
 #, fuzzy
-msgid "Cycle monster targets"
-msgstr "Pokaż imię"
+msgid "Highlight map portals"
+msgstr "Podświetlenie"
 
-#: src/gui/setup_other.cpp:135
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Włącz joystick"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Podświetlenie"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr ""
-
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:67
 #, fuzzy
-msgid "Enable shop mode"
-msgstr "Włącz/Wysłącz Handlowanie"
+msgid "Enable quick stats"
+msgstr "Włącz joystick"
 
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:73
 #, fuzzy
-msgid "Enable debug log"
-msgstr "Nie można kupić."
-
-#: src/gui/setup_other.cpp:161
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Nie można kupić."
+msgid "Show warps particles"
+msgstr "jako cząsteczkę"
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Włącz joystick"
-
-#: src/gui/setup_other.cpp:173
-#, fuzzy
-msgid "Show warps particles"
-msgstr "jako cząsteczkę"
-
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+#, fuzzy
+msgid "Cycle monster targets"
+msgstr "Pokaż imię"
+
+#: src/gui/setup_other.cpp:92
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+#, fuzzy
+msgid "Enable bot checker"
+msgstr "Włącz joystick"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+#, fuzzy
+msgid "Afk message"
+msgstr "Wiadomość"
+
+#: src/gui/setup_other.cpp:114
 #, fuzzy
 msgid "Enable attack filter"
 msgstr "Nie można kupić."
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+#, fuzzy
+msgid "Enable shop mode"
+msgstr "Włącz/Wysłącz Handlowanie"
+
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
+#: src/gui/setup_other.cpp:123
 #, fuzzy
-msgid "Afk message"
-msgstr "Wiadomość"
+msgid "Enable debug log"
+msgstr "Nie można kupić."
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2519,12 +2539,12 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Prośba o Handel"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, fuzzy, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce handlować z tobą, zgadzasz się?"
@@ -4407,7 +4427,7 @@ msgstr "Dziękuję za kupno."
 msgid "Unable to buy."
 msgstr "Nie można kupić."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Siła"
 
@@ -4416,7 +4436,7 @@ msgstr "Siła"
 msgid "Strength %+.1f"
 msgstr "Siła %+d"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Zwinność"
 
@@ -4425,7 +4445,7 @@ msgstr "Zwinność"
 msgid "Agility %+.1f"
 msgstr "Zwinność %+d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Zręczność"
 
@@ -4434,7 +4454,7 @@ msgstr "Zręczność"
 msgid "Dexterity %+.1f"
 msgstr "Zręczność %+d"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Witalność"
 
@@ -4443,7 +4463,7 @@ msgstr "Witalność"
 msgid "Vitality %+.1f"
 msgstr "Witalność %+d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Inteligencja"
 
@@ -5011,55 +5031,55 @@ msgstr "Zduplikowany login"
 msgid "Unknown connection error."
 msgstr "Nieznany błąd połączenia"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Szczęście"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 #, fuzzy
 msgid "Defense"
 msgstr "Obrona:"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 #, fuzzy
 msgid "M.Attack"
 msgstr "Atak M.:"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 #, fuzzy
 msgid "M.Defense"
 msgstr "Obrona M.:"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 #, fuzzy
 msgid "% Accuracy"
 msgstr "% Celność:"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 #, fuzzy
 msgid "% Evade"
 msgstr "% Unik:"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 #, fuzzy
 msgid "% Critical"
 msgstr "Uderzenie Krytyczne"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Atak %+d"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Atak %+d"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 #, fuzzy
 msgid "Attack Range"
 msgstr "Potwór uderza Gracza"
@@ -5952,9 +5972,6 @@ msgstr "Nieznany przedmiot"
 #~ msgid "If <channel> doesn't exist, it's created."
 #~ msgstr "Jeżeli <kanał> nie istnieje, to zostanie utworzony."
 
-#~ msgid "Command: /list"
-#~ msgstr "Komenda: /list"
-
 #~ msgid "This command shows a list of all channels."
 #~ msgstr "Ta komenda pokazuje listę wszystkich kanałów."
 
diff --git a/po/pt.po b/po/pt.po
index 1a3d0de10..cd457add8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
-"PO-Revision-Date: 2011-06-11 17:16+0000\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
+"PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -23,43 +23,43 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr "errou"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -69,49 +69,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, 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:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, 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."
@@ -287,11 +288,11 @@ msgstr "Recursos de imagens orfãos:"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Depurador"
 
@@ -328,21 +329,26 @@ msgstr "Não foi possível carregar o mapa"
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Posição no PVP: %d"
 
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
 #: src/gui/botcheckerwindow.cpp:265
 msgid "Bot Checker"
 msgstr "Analizador de bot"
@@ -351,19 +357,19 @@ msgstr "Analizador de bot"
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 msgid "Move"
 msgstr "Mover"
 
@@ -376,9 +382,9 @@ msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Comprar"
 
@@ -422,9 +428,9 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Vender"
@@ -432,15 +438,15 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -693,7 +699,7 @@ msgstr "arco-íris 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
@@ -715,10 +721,10 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -845,7 +851,7 @@ msgstr "Dano Crítico:"
 #: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
 msgid "Ping: %s ms"
-msgstr ""
+msgstr "Ping: %s ms"
 
 #: src/gui/debugwindow.cpp:393
 #, c-format
@@ -859,25 +865,25 @@ msgstr "Saída: %d bytes/s"
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "Você sabia?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fechar"
 
 #: src/gui/didyouknowwindow.cpp:62
 msgid "< Previous"
-msgstr ""
+msgstr "< Anterior"
 
 #: src/gui/didyouknowwindow.cpp:63
 msgid "Next >"
-msgstr ""
+msgstr "Próximo >"
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
-msgstr ""
+msgstr "Abrir automaticamente esta janela"
 
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
@@ -891,8 +897,8 @@ msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -930,31 +936,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -963,17 +969,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1038,36 +1044,36 @@ msgstr "Resetar tempo"
 #: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
 #, c-format
 msgid "Level: %d at %f%%"
-msgstr ""
+msgstr "Nível: %d em %f%%"
 
 #: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
 #, c-format
 msgid "Exp: %d/%d Left: %d"
-msgstr ""
+msgstr "Exp: %d%d faltando: %d"
 
 #: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
 #: src/gui/killstats.cpp:224
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr ""
+msgstr "1%% = %d exp, avg mob para 1%%: %s"
 
 #: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
 #: src/gui/killstats.cpp:233
 #, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr ""
+msgstr "Mortes: %s, total exp: %s"
 
 #: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
 #: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Avg Exp: %s, No de avg mob para o próximo nível: %s"
 
 #: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
 #: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr ""
+msgstr "Mortes/Min: %s Exp/Min: %s"
 
 #: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
 #: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
@@ -1075,41 +1081,41 @@ msgstr ""
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Velocidade de exp por %d min: %s"
+msgstr[1] "Velocidade de exp por %d mins: %s"
 
 #: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
 #, 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] ""
+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:99 src/gui/killstats.cpp:240
 msgid "Last kill exp:"
-msgstr ""
+msgstr "Exp de última morte:"
 
 #: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
 #: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
 #: src/gui/killstats.cpp:371
 msgid "Time before jacko spawn:"
-msgstr ""
+msgstr "Tempo para próximo JackO:"
 
 #: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
 #: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
 #: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
 #, c-format
 msgid "  Time for next level: %s"
-msgstr ""
+msgstr "Tempo para próximo nível:  %s"
 
 #: src/gui/killstats.cpp:360
 #, c-format
 msgid "%s %d?"
-msgstr ""
+msgstr "%s %d?"
 
 #: src/gui/killstats.cpp:366
 msgid "jacko spawning"
-msgstr ""
+msgstr "JackOvai aparecer"
 
 #: src/gui/logindialog.cpp:59
 msgid "Normal"
@@ -1208,7 +1214,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1246,291 +1252,306 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Sussuro"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr "Curar:"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 msgid "Be friend"
 msgstr "Ser Amigo"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr "Ser inimigo"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr "Apagar"
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 msgid "Unignore"
 msgstr "Não ignorar"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 msgid "Imitation"
 msgstr "Imitar"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Deixar pelado"
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 msgid "Show Items"
 msgstr "Mostar itens:"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr "Deixar sem Roupas"
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr "Remover da Lista de Ataques"
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 msgid "Add to priority attack list"
 msgstr "Adicionar a prioridade na lista de ataques"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 msgid "Remove"
 msgstr "A Remover"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr "Carregar Antigas Roupas"
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr "Carregar Antigos Feitiços"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr "Não remover nome"
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 msgid "Remove name"
 msgstr "Remover nome"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 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:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Drop all"
-msgstr ""
+msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
-msgstr ""
+msgstr "Copiar para o chat"
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
 msgstr "Mover a cima"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -1685,116 +1706,114 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Mecanismo de som"
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr "Remover mensagens coloridas do chat"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Permitir feitiços e comandos de GM em todas abas"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr "Mostrar lista de cores do chat"
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr "Limite de caracteres na linha de chat"
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr "Salvar conversas"
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr "Limite de linhas máximas no chat"
+
+#: src/gui/setup_chat.cpp:79
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr "Esconder mensagens de loja"
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr "Mostrar mensagens antigas"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr "Mostrar lista de cores do chat"
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr "Editar"
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr "Limite de caracteres na linha de chat"
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr "Limite de linhas máximas no chat"
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar as abas de chat caso precisar"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "A cor vai ficar assim"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Cores"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Estático"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulso"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Arco-íris"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr "Vermelho:"
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr "Verde:"
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr "Azul:"
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -1806,6 +1825,11 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
@@ -1850,117 +1874,113 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
+msgstr "Habilitar ataque do lado do servidor"
+
+#: src/gui/setup_other.cpp:52
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
+msgstr "Auto-ajustar posição"
+
+#: src/gui/setup_other.cpp:58
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr "Destacar alcance de meu ataque"
-
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
-msgstr "Destacar alcance de inimigos"
-
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
-msgstr "Alvo de jogadores em ciclo"
-
-#: src/gui/setup_other.cpp:132
-msgid "Cycle monster targets"
-msgstr "Alvo de monstros em ciclo"
-
-#: src/gui/setup_other.cpp:135
-msgid "Enable bot checker"
-msgstr "Habilitar Analisador de bot"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr "Movimentos loucos"
-
-#: src/gui/setup_other.cpp:152
-msgid "Enable shop mode"
-msgstr "Habilitar modo loja"
-
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
-msgstr "Habilitar proteção contra servidores com bugs"
-
-#: src/gui/setup_other.cpp:158
-msgid "Enable debug log"
-msgstr "Habilitar Depurador"
-
-#: src/gui/setup_other.cpp:161
-msgid "Enable server side attack"
-msgstr "Habilitar ataque do lado do servidor"
-
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
-msgstr "Auto-ajustar posição"
-
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
-msgstr "Atacar enquanto se move"
-
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:67
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
+msgstr "Destacar alcance de meu ataque"
+
+#: src/gui/setup_other.cpp:73
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:176
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
+msgstr "Destacar alcance de inimigos"
+
+#: src/gui/setup_other.cpp:80
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
+msgstr "Alvo de jogadores em ciclo"
+
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
+msgstr "Alvo de monstros em ciclo"
+
+#: src/gui/setup_other.cpp:92
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
+msgstr "Habilitar Analisador de bot"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr "Mostrar menssagens de job exp"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr "Movimentos loucos"
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr "Mensagem Ausente"
+
+#: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
 msgstr "A habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
-msgstr "Movimento Louco A"
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
+msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:297
-msgid "Afk message"
-msgstr "Mensagem Ausente"
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
+msgstr "Habilitar proteção contra servidores com bugs"
+
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
+msgstr "Habilitar Depurador"
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2331,12 +2351,12 @@ msgstr "Anúncio"
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
@@ -3525,11 +3545,11 @@ msgstr "DE"
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "VS"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "Você sabia"
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
@@ -3740,7 +3760,7 @@ msgstr "Janela Quem está online"
 
 #: src/keyboardconfig.cpp:161
 msgid "Did you know Window"
-msgstr ""
+msgstr "Janela Você sabia"
 
 #: src/keyboardconfig.cpp:164
 msgid "Previous Social Tab"
@@ -3931,7 +3951,7 @@ msgstr "Alterar modo de camera"
 
 #: src/keyboardconfig.cpp:336
 msgid "Modifier key"
-msgstr ""
+msgstr "Modificar chave"
 
 #: src/keyboardconfig.cpp:408
 #, c-format
@@ -4115,7 +4135,7 @@ msgstr "Obrigado pela compra."
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Força"
 
@@ -4124,7 +4144,7 @@ msgstr "Força"
 msgid "Strength %+.1f"
 msgstr "Força %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Agilidade"
 
@@ -4133,7 +4153,7 @@ msgstr "Agilidade"
 msgid "Agility %+.1f"
 msgstr "Agilidade %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Destreza"
 
@@ -4142,7 +4162,7 @@ msgstr "Destreza"
 msgid "Dexterity %+.1f"
 msgstr "Destreza %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Vitalidade"
 
@@ -4151,7 +4171,7 @@ msgstr "Vitalidade"
 msgid "Vitality %+.1f"
 msgstr "Vitalidade %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Inteligência"
 
@@ -4675,47 +4695,47 @@ msgstr "Login duplicado."
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado do servidor!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Sorte"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 msgid "Defense"
 msgstr "Defesa"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "% Evade"
 msgstr "% Evasão"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "% Critical"
 msgstr "% Críticos"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2b95b864c..9c304ba6a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 #   <alasmirt@gmail.com>, 2011.
-#   <freya.df@gmail.com>, 2011.
 # alastrim <alasmirt@gmail.com>, 2011.
+#   <freya.df@gmail.com>, 2011.
 # freya <freya.df@gmail.com>, 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-06-11 20:15+0300\n"
-"PO-Revision-Date: 2011-06-11 17:16+0000\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
+"PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/manaplus/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -25,43 +25,43 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr "errou"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -71,49 +71,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, 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:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, 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."
@@ -289,11 +290,11 @@ msgstr "Recurso de imagem orfão:"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Depurador"
 
@@ -330,21 +331,26 @@ msgstr "Não foi possível carregar o mapa"
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Posição no PVP: %d"
 
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
 #: src/gui/botcheckerwindow.cpp:265
 msgid "Bot Checker"
 msgstr "Analizador de bot"
@@ -353,19 +359,19 @@ msgstr "Analizador de bot"
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 msgid "Move"
 msgstr "Mover"
 
@@ -378,9 +384,9 @@ msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Comprar"
 
@@ -424,9 +430,9 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Vender"
@@ -434,15 +440,15 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -695,7 +701,7 @@ msgstr "arco-íris 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
@@ -717,10 +723,10 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -847,7 +853,7 @@ msgstr "Hit crítico:"
 #: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
 msgid "Ping: %s ms"
-msgstr ""
+msgstr "Ping: %s ms"
 
 #: src/gui/debugwindow.cpp:393
 #, c-format
@@ -861,25 +867,25 @@ msgstr "Saída: %d bytes/s"
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "Você Sabia?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Fechar"
 
 #: src/gui/didyouknowwindow.cpp:62
 msgid "< Previous"
-msgstr ""
+msgstr "< Anterior"
 
 #: src/gui/didyouknowwindow.cpp:63
 msgid "Next >"
-msgstr ""
+msgstr "Próximo >"
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "Auto open this window"
-msgstr ""
+msgstr "Auto abrir esta janela"
 
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
@@ -893,8 +899,8 @@ msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -932,31 +938,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -965,17 +971,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1040,36 +1046,36 @@ msgstr "Resetar tempo"
 #: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
 #, c-format
 msgid "Level: %d at %f%%"
-msgstr ""
+msgstr "Nível: %d em %f%%"
 
 #: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
 #, c-format
 msgid "Exp: %d/%d Left: %d"
-msgstr ""
+msgstr "Exp: %d%d Falta: %d"
 
 #: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
 #: src/gui/killstats.cpp:224
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr ""
+msgstr "1%% = %d ex, avg mob por 1%%: %s"
 
 #: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
 #: src/gui/killstats.cpp:233
 #, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr ""
+msgstr "Mortes: %s Total exp: %s"
 
 #: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
 #: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Avg Exp: %s No. de avg mob para próximo nível: %s"
 
 #: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
 #: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr ""
+msgstr "Mortes/Min: %s Exp/Min: %s"
 
 #: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
 #: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
@@ -1077,41 +1083,41 @@ msgstr ""
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Velocidade de exp por %d min: %s"
+msgstr[1] "Velocidade de exp por %d mins: %s"
 
 #: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
 #, 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] ""
+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:99 src/gui/killstats.cpp:240
 msgid "Last kill exp:"
-msgstr ""
+msgstr "Ultim exp por morte:"
 
 #: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
 #: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
 #: src/gui/killstats.cpp:371
 msgid "Time before jacko spawn:"
-msgstr ""
+msgstr "Tempo para próxima aparição do JackO:"
 
 #: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
 #: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
 #: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
 #, c-format
 msgid "  Time for next level: %s"
-msgstr ""
+msgstr "Tempo para próximo nível: %s"
 
 #: src/gui/killstats.cpp:360
 #, c-format
 msgid "%s %d?"
-msgstr ""
+msgstr "%s %d?"
 
 #: src/gui/killstats.cpp:366
 msgid "jacko spawning"
-msgstr ""
+msgstr "Aparição do JackO"
 
 #: src/gui/logindialog.cpp:59
 msgid "Normal"
@@ -1210,7 +1216,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1248,291 +1254,306 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Mensagem Privada:"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr "Cura"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 msgid "Be friend"
 msgstr "Ser amigo"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr "Ser inimigo"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr "Apagar"
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 msgid "Unignore"
 msgstr "Não ignorar"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 msgid "Imitation"
 msgstr "Imitar"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Nu"
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 msgid "Show Items"
 msgstr "Mostrar itens:"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr "Despir"
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr "Remover da lista de ataque"
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 msgid "Add to priority attack list"
 msgstr "Adicionar na prioridade da lista de ataques"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 msgid "Remove"
 msgstr "Remover"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr "Carregar velhas roupas"
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr "Carregar velhos feitiços"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr "Não remover o nome"
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 msgid "Remove name"
 msgstr "Remover o nome"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 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:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Drop all"
-msgstr ""
+msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
-msgstr ""
+msgstr "Copiar para chat"
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -1687,116 +1708,114 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Mecanismo de som"
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr "Remover mensagens coloridas do chat"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Permitir feitiços e comandos de GM em todas abas"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr "Mostrar lista de cores do chat"
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr "Limite de caracteres na linha de chat"
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr "Salvar conversas"
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr "Limite de linhas máximas no chat"
+
+#: src/gui/setup_chat.cpp:79
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr "Esconder mensagens de loja"
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr "Mostrar mensagens antigas"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr "Mostrar lista de cores do chat"
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr "Editar"
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr "Limite de caracteres na linha de chat"
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr "Limite de linhas máximas no chat"
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar aba de chat caso precisar"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "A cor vai ficar assim"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Cores"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Estático"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulso"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Arco-íris"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr "Vermelho:"
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr "Verde:"
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr "Azul:"
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -1808,6 +1827,11 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr "Editar"
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
@@ -1852,117 +1876,113 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
+msgstr "Habilitar ataque do lado do servidor"
+
+#: src/gui/setup_other.cpp:52
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
+msgstr "Auto-ajustar posição"
+
+#: src/gui/setup_other.cpp:58
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr "Destacar alcance de meu ataque"
-
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
-msgstr "Destacar alcance de inimigos"
-
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
-msgstr "Alvo de jogadores em ciclo"
-
-#: src/gui/setup_other.cpp:132
-msgid "Cycle monster targets"
-msgstr "Alvo de monstros em ciclo"
-
-#: src/gui/setup_other.cpp:135
-msgid "Enable bot checker"
-msgstr "Habilitar Analisador de bot"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr "Movimentos loucos"
-
-#: src/gui/setup_other.cpp:152
-msgid "Enable shop mode"
-msgstr "Habilitar modo loja"
-
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
-msgstr "Habilitar proteção contra servidores com bugs"
-
-#: src/gui/setup_other.cpp:158
-msgid "Enable debug log"
-msgstr "Habilitar Depurador"
-
-#: src/gui/setup_other.cpp:161
-msgid "Enable server side attack"
-msgstr "Habilitar ataque do lado do servidor"
-
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
-msgstr "Auto-ajustar posição"
-
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
-msgstr "Atacar enquanto se move"
-
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:67
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
+msgstr "Destacar alcance de meu ataque"
+
+#: src/gui/setup_other.cpp:73
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:176
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
+msgstr "Destacar alcance de inimigos"
+
+#: src/gui/setup_other.cpp:80
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
+msgstr "Alvo de jogadores em ciclo"
+
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
+msgstr "Alvo de monstros em ciclo"
+
+#: src/gui/setup_other.cpp:92
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
+msgstr "Habilitar Analisador de bot"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr "Movimentos loucos"
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr "Mensagem Ausente"
+
+#: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
-msgstr "Movimento Louco A"
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
+msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:297
-msgid "Afk message"
-msgstr "Mensagem Ausente"
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
+msgstr "Habilitar proteção contra servidores com bugs"
+
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
+msgstr "Habilitar Depurador"
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2333,12 +2353,12 @@ msgstr "Anúncio"
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
@@ -3527,11 +3547,11 @@ msgstr "DE"
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "YK"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "Você Sabia"
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
@@ -3742,7 +3762,7 @@ msgstr "Janela Quem está online"
 
 #: src/keyboardconfig.cpp:161
 msgid "Did you know Window"
-msgstr ""
+msgstr "Janela Você Sabia "
 
 #: src/keyboardconfig.cpp:164
 msgid "Previous Social Tab"
@@ -3933,7 +3953,7 @@ msgstr "Alterar modo de camera"
 
 #: src/keyboardconfig.cpp:336
 msgid "Modifier key"
-msgstr ""
+msgstr "Chave de modificação"
 
 #: src/keyboardconfig.cpp:408
 #, c-format
@@ -4117,7 +4137,7 @@ msgstr "Obrigado pela compra."
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Força"
 
@@ -4126,7 +4146,7 @@ msgstr "Força"
 msgid "Strength %+.1f"
 msgstr "Força %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Agilidade"
 
@@ -4135,7 +4155,7 @@ msgstr "Agilidade"
 msgid "Agility %+.1f"
 msgstr "Agilidade %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Destreza"
 
@@ -4144,7 +4164,7 @@ msgstr "Destreza"
 msgid "Dexterity %+.1f"
 msgstr "Destreza %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Vitalidade"
 
@@ -4153,7 +4173,7 @@ msgstr "Vitalidade"
 msgid "Vitality %+.1f"
 msgstr "Vitalidade %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Inteligência"
 
@@ -4677,47 +4697,47 @@ msgstr "Login duplicado."
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado do servidor!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Sorte"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 msgid "Defense"
 msgstr "Defesa"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "% Evade"
 msgstr "% Evasão"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "% Critical"
 msgstr "% Críticos"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
diff --git a/po/ru.po b/po/ru.po
index 0abfbda8d..9bf2acb07 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
-"PO-Revision-Date: 2011-06-11 17:20+0000\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
+"PO-Revision-Date: 2011-06-20 00:35+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -22,43 +22,43 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr "промах"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -68,49 +68,50 @@ msgstr "Смена игрового сервера"
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1564
+#: src/client.cpp:1587
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -291,11 +292,11 @@ msgstr "Удаленных изображений:"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Отладка"
 
@@ -332,21 +333,26 @@ msgstr "Не удалось загрузить карту"
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
 msgstr "Группа: %s"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, c-format
 msgid "Guild: %s"
 msgstr "Гильдия: %s"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "PvP ранг: %d"
 
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr "Комментарий: %s"
+
 #: src/gui/botcheckerwindow.cpp:265
 msgid "Bot Checker"
 msgstr "Окно детектора ботов"
@@ -355,19 +361,19 @@ msgstr "Окно детектора ботов"
 msgid "Name"
 msgstr "Имя"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Атака"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Разговор"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 msgid "Move"
 msgstr "Движение"
 
@@ -380,9 +386,9 @@ msgid "Reset"
 msgstr "Сбросить"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Купить"
 
@@ -426,9 +432,9 @@ msgstr "Макс"
 msgid "Shop"
 msgstr "Магазин"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Продать"
@@ -436,15 +442,15 @@ msgstr "Продать"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -697,7 +703,7 @@ msgstr "радуга 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Чат"
 
@@ -719,10 +725,10 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 msgid "Ignore"
 msgstr "Игнорировать"
 
@@ -867,7 +873,7 @@ msgstr "Вы знаете?"
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Закрыть"
 
@@ -895,8 +901,8 @@ msgstr "Снаряжение"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Снять"
 
@@ -934,31 +940,31 @@ msgid "id"
 msgstr "ид"
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Надеть"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Использовать"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Разделить"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr "Наряды"
 
@@ -967,17 +973,17 @@ msgid "Weight:"
 msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Бросить"
@@ -1214,7 +1220,7 @@ msgstr "Применить"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 msgid "Clear"
 msgstr "Очистить"
 
@@ -1252,291 +1258,306 @@ msgstr "Сначала снять"
 msgid "Away outfit"
 msgstr "наряд отсутствия"
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Торговать"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Приват"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr "Лечить"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 msgid "Be friend"
 msgstr "Подружиться"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 msgid "Disregard"
 msgstr "Пренебреч"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr "Стереть"
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 msgid "Unignore"
 msgstr "Не игнорировать"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "@@ignore|Полностью игнорировать@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 msgid "Follow"
 msgstr "Следовать"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 msgid "Imitation"
 msgstr "Имитировать"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 msgid "Kick player"
 msgstr "Кикнуть игрока"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Уничтожить"
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 msgid "Show Items"
 msgstr "Показать предметы"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr "Раздеть"
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr "Добавить коментарий"
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr "Кикнуть"
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 msgid "Pick up"
 msgstr "Поднять"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr "Элмент карты"
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 msgid "Remove"
 msgstr "Удалить"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr "Загрузить старые наряды"
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Заклинания"
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr "Загрузить старые заклинания"
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr "Не скрывать имя"
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 msgid "Remove name"
 msgstr "Скрывать имя"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 msgid "Enable away"
 msgstr "Рарешить режим отошел"
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 msgid "Disable away"
 msgstr "Запретить режим отошел"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "Покинуть"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr "Имя:                    "
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr "Комментарий             "
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr "Комментарий:                      "
+
+#: src/gui/popupmenu.cpp:1541
 msgid "Add to trade"
 msgstr "Добавить к торговли"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 msgid "Add to trade 10"
 msgstr "Добавить к торговле 10"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 msgid "Add to trade half"
 msgstr "Добавить к торговле половину"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 msgid "Store 10"
 msgstr "Сохранить 10"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 msgid "Store half"
 msgstr "Сохранить половину"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 msgid "Store all"
 msgstr "Сохранить все"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Drop all"
 msgstr "Бросить все"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 msgid "Retrieve half"
 msgstr "Получить половину"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 msgid "Retrieve all"
 msgstr "Получить все"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr "Загрузить старые горячие клавиши предметов"
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr "Загрузить старые данные"
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr "Спрятать"
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr "Показать"
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(поумолчанию)"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
 msgstr "Передвинуть выше"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -1691,116 +1712,114 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Звуковой движок"
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr "Удалить цвета из полученных сообщений в чате"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr "Оставлять сообщения магии на вкладке отладки"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Разрешить магические и администраторские команды на всех вкладках"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr "Показывать сообщения сервера на вкладке отладки"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr "Показать список цветов чата"
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr "Ограничить число символов в строке чата"
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr "Включить лог чата"
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr "Ограничить число строк в чате"
+
+#: src/gui/setup_chat.cpp:79
 msgid "Enable trade tab"
 msgstr "Включить вкладки торговли"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr "Скрыть сообщения магазина"
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr "Показать историю чата"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 msgid "Enable battle tab"
 msgstr "Включить вкладку боя"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 msgid "Show battle events"
 msgstr "Показать сообщения боя"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr "Показать список цветов чата"
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr "Изменить"
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr "Ограничить число символов в строке чата"
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr "Ограничить число строк в чате"
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 msgid "Resize chat tabs if need"
 msgstr "Подгонять размер чата"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr "Использовать местное время"
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Вот, как выглядит сей цвет"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "Введите: "
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Статичный"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Пульсирующий"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Радуга"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Спектр"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
 msgstr "Задержка:"
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
 msgstr "Красный:"
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
 msgstr "Зеленый:"
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
 msgstr "Синий:"
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr "Прозрачность:"
 
@@ -1812,6 +1831,11 @@ msgstr "Применить"
 msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr "Изменить"
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
@@ -1856,117 +1880,113 @@ msgstr "По умолчанию"
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружен(ы) конфликт(ы) клавиш!"
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr "Разное"
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Показ. повр. нанесенные монстрам"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
+msgstr "Включить серверную атаку"
+
+#: src/gui/setup_other.cpp:52
 msgid "Auto target only reachable monsters"
 msgstr "Автоприцел по доступным монстрам"
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
+msgstr "Авто. исправ. позиции"
+
+#: src/gui/setup_other.cpp:58
 msgid "Highlight map portals"
 msgstr "Подсветка точек перехода на карте"
 
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr "Подсветка радиуса атаки игрока"
-
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
-msgstr "Подсветка радиуса атаки монстров"
-
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
-msgstr "Прокручивать прицел по игрокам"
-
-#: src/gui/setup_other.cpp:132
-msgid "Cycle monster targets"
-msgstr "Прокручивать прицел по монстрам"
-
-#: src/gui/setup_other.cpp:135
-msgid "Enable bot checker"
-msgstr "Включить детектор ботов"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr "Атаковать в движении"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 msgid "Highlight floor items"
 msgstr "Подсветка предметов на полу"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr "Программа для сумасшедших движений A"
-
-#: src/gui/setup_other.cpp:152
-msgid "Enable shop mode"
-msgstr "Включить режим магазина"
-
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
-msgstr "Включить защиту от сбойных серверов"
-
-#: src/gui/setup_other.cpp:158
-msgid "Enable debug log"
-msgstr "Включить отлад. лог"
-
-#: src/gui/setup_other.cpp:161
-msgid "Enable server side attack"
-msgstr "Включить серверную атаку"
-
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
-msgstr "Авто. исправ. позиции"
-
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
-msgstr "Атаковать в движении"
-
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:67
 msgid "Enable quick stats"
 msgstr "Включить быструю смену статов"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
+msgstr "Подсветка радиуса атаки игрока"
+
+#: src/gui/setup_other.cpp:73
 msgid "Show warps particles"
 msgstr "Показывать анимацию порталов"
 
-#: src/gui/setup_other.cpp:176
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
+msgstr "Подсветка радиуса атаки монстров"
+
+#: src/gui/setup_other.cpp:80
 msgid "Accept sell/buy requests"
 msgstr "Принимать запросы купить/продать"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
+msgstr "Прокручивать прицел по игрокам"
+
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr "Показывать жизнь мобов"
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
+msgstr "Прокручивать прицел по монстрам"
+
+#: src/gui/setup_other.cpp:92
 msgid "Show own hp bar"
 msgstr "Показывать свою жизнь"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
+msgstr "Включить детектор ботов"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr "Показывать опыт работы."
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr "Программа для сумасшедших движений A"
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr "Показ. всплыв. сообщения игроков"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr "Показывать расширенные миникарты"
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr "Сообщение для отошел"
+
+#: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
 msgstr "ключить фильтр атак"
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
-msgstr "Сумашедшее движение A"
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
+msgstr "Включить режим магазина"
 
-#: src/gui/setup_other.cpp:297
-msgid "Afk message"
-msgstr "Сообщение для отошел"
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
+msgstr "Включить защиту от сбойных серверов"
+
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
+msgstr "Включить отлад. лог"
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2339,12 +2359,12 @@ msgstr "Анонс"
 msgid "Show links in announce"
 msgstr "Показывать ссылки"
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s хочет %s %s, вы принимаете предложение?"
@@ -4123,7 +4143,7 @@ msgstr "Спасибо за покупку!"
 msgid "Unable to buy."
 msgstr "Низзя купить!"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Сила (str)"
 
@@ -4132,7 +4152,7 @@ msgstr "Сила (str)"
 msgid "Strength %+.1f"
 msgstr "Сила (str) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Выносливость (agi)"
 
@@ -4141,7 +4161,7 @@ msgstr "Выносливость (agi)"
 msgid "Agility %+.1f"
 msgstr "Выносливость (agi) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Ловкость (dex)"
 
@@ -4150,7 +4170,7 @@ msgstr "Ловкость (dex)"
 msgid "Dexterity %+.1f"
 msgstr "Ловкость (dex) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Живучесть (vit)"
 
@@ -4159,7 +4179,7 @@ msgstr "Живучесть (vit)"
 msgid "Vitality %+.1f"
 msgstr "Живучесть (vit) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Интеллект (int)"
 
@@ -4688,47 +4708,47 @@ msgstr "Двойная попытка подключения"
 msgid "Unknown connection error."
 msgstr "Неизвестная ошибка подключения."
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Отключено от сервера!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Удача (luk)"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 msgid "Defense"
 msgstr "Защита"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 msgid "M.Attack"
 msgstr "Маг. Атака"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "M.Defense"
 msgstr "Маг.Защита"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "% Accuracy"
 msgstr "% Точности"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "% Evade"
 msgstr "% Уклонения"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "% Critical"
 msgstr "% Критический удар"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 msgid "Attack Delay"
 msgstr "Задержка атаки"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Walk Delay"
 msgstr "Задержка движения"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "Attack Range"
 msgstr "Зона атаки"
 
diff --git a/po/sv.po b/po/sv.po
index b6f141ed3..a22ff36c9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"POT-Creation-Date: 2011-06-20 03:19+0300\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -24,48 +24,48 @@ msgstr ""
 msgid "Visible on map"
 msgstr "Synliga namn"
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:513
+#: src/being.cpp:517
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Inställningar"
 
-#: src/client.cpp:855
+#: src/client.cpp:875
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Ansluter till kartservern..."
 
-#: src/client.cpp:886
+#: src/client.cpp:906
 #, fuzzy
 msgid "Logging in"
 msgstr "Användarnamn"
 
-#: src/client.cpp:919
+#: src/client.cpp:939
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1011
+#: src/client.cpp:1031
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Välj karaktär"
 
-#: src/client.cpp:1042
+#: src/client.cpp:1062
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Ansluter till kartservern..."
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
+#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
 #: 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:391
@@ -75,53 +75,54 @@ msgstr "Server"
 msgid "Error"
 msgstr "Fel"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1125
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1130
+#: src/client.cpp:1152
 #, fuzzy
 msgid "Password Change"
 msgstr "Lösenord:"
 
-#: src/client.cpp:1131
+#: src/client.cpp:1153
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1150
+#: src/client.cpp:1172
 #, fuzzy
 msgid "Email Change"
 msgstr "Ändra"
 
-#: src/client.cpp:1151
+#: src/client.cpp:1173
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Medlem befordrad."
 
-#: src/client.cpp:1171
+#: src/client.cpp:1193
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Avregistrera"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1194
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
+#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
+#: src/client.cpp:1873
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1564
+#: src/client.cpp:1587
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ogiltig uppdateringsvärd: "
 
-#: src/client.cpp:1598 src/client.cpp:1604
+#: src/client.cpp:1621 src/client.cpp:1627
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: src/client.cpp:1625
+#: src/client.cpp:1648
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -309,11 +310,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Alternativ till /%s är ”yes”, ”no”, ”true”, ”false”, ”1”, ”0”."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Allmänt"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
@@ -354,21 +355,26 @@ msgstr "Kunde inte ladda karta"
 msgid "Error while loading %s"
 msgstr "Kunde inte ladda %s"
 
-#: src/gui/beingpopup.cpp:100
+#: src/gui/beingpopup.cpp:108
 #, fuzzy, c-format
 msgid "Party: %s"
 msgstr "Grupp (%s)"
 
-#: src/gui/beingpopup.cpp:113
+#: src/gui/beingpopup.cpp:122
 #, fuzzy, c-format
 msgid "Guild: %s"
 msgstr "Gillen"
 
-#: src/gui/beingpopup.cpp:125
+#: src/gui/beingpopup.cpp:135
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
+#: src/gui/beingpopup.cpp:146
+#, fuzzy, c-format
+msgid "Comment: %s"
+msgstr "Kommando: /list"
+
 #: src/gui/botcheckerwindow.cpp:265
 #, fuzzy
 msgid "Bot Checker"
@@ -378,19 +384,19 @@ msgstr "Chattfönster"
 msgid "Name"
 msgstr "Namn"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:128
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:585
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:259
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
 msgid "Attack"
 msgstr "Attackera"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:256
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Prata"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:239
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:642
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
 #, fuzzy
 msgid "Move"
 msgstr "Gå uppåt"
@@ -404,9 +410,9 @@ msgid "Reset"
 msgstr "Återställ"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:247
-#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:649
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Köp"
 
@@ -450,9 +456,9 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Affär"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:248
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:650 src/gui/selldialog.cpp:53
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Sälj"
@@ -460,15 +466,15 @@ msgstr "Sälj"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:311
-#: src/gui/popupmenu.cpp:332 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:461 src/gui/popupmenu.cpp:480
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:513
-#: src/gui/popupmenu.cpp:694 src/gui/popupmenu.cpp:718
-#: src/gui/popupmenu.cpp:1584 src/gui/popupmenu.cpp:1612
-#: src/gui/popupmenu.cpp:1668 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1746 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1852 src/gui/popupmenu.cpp:1872
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
 #: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -741,7 +747,7 @@ msgstr "Regnbåge"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:64
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chatt"
 
@@ -763,10 +769,10 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:144
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:600
-#: src/gui/popupmenu.cpp:608
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
 #, fuzzy
 msgid "Ignore"
 msgstr "Ignorerad"
@@ -928,7 +934,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
 #: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "Stäng"
 
@@ -958,8 +964,8 @@ msgstr "Utrustning"
 
 #: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
 #: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1638
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
 msgstr "Avrusta"
 
@@ -1000,32 +1006,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1545
-#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1685
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
 msgstr "Utrusta"
 
 #: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1548
-#: src/gui/popupmenu.cpp:1607 src/gui/popupmenu.cpp:1644
-#: src/gui/popupmenu.cpp:1688
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Använd"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1552 src/gui/popupmenu.cpp:1649
-#: src/gui/popupmenu.cpp:1692
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 #, fuzzy
 msgid "Drop..."
 msgstr "Släpp"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1561
-#: src/gui/popupmenu.cpp:1658 src/gui/popupmenu.cpp:1701
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Dela"
 
 #: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
 msgstr ""
 
@@ -1034,17 +1040,17 @@ msgid "Weight:"
 msgstr "Vikt:"
 
 #: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1524 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1704 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
 msgid "Store"
 msgstr "Lagra"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1568
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
 msgid "Retrieve"
 msgstr "Hämta"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
-#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Släpp"
@@ -1290,7 +1296,7 @@ msgstr "Vidare"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:530
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
 #, fuzzy
 msgid "Clear"
 msgstr "Spjut"
@@ -1333,333 +1339,348 @@ msgstr "Avrusta"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:127 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
 #: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Byteshandla"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:349
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
 msgid "Whisper"
 msgstr "Viskning"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
-#: src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
 #, fuzzy
 msgid "Be friend"
 msgstr "Vän"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
-#: src/gui/popupmenu.cpp:630
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
 #, fuzzy
 msgid "Disregard"
 msgstr "Förbisedd"
 
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:601 src/gui/popupmenu.cpp:609
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
 #, fuzzy
 msgid "Unignore"
 msgstr "Ignorerad"
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
-#: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
 #: src/playerrelations.cpp:400
 #, fuzzy
 msgid "Completely ignore"
 msgstr "@@ignore|Ignorera %s fullständigt@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
 #, fuzzy
 msgid "Follow"
 msgstr "låg"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "Imitation"
 msgstr "Ändra epostadress"
 
-#: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
 #, fuzzy
 msgid "Invite to party"
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
 #, fuzzy
 msgid "Kick from party"
 msgstr "@@admin-kick|Sparka spelare@@"
 
-#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
 #, fuzzy
 msgid "Kick from guild"
 msgstr "@@admin-kick|Sparka spelare@@"
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
 #, fuzzy
 msgid "Change pos in guild"
 msgstr "Ändra"
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
 #, fuzzy
 msgid "Invite to guild"
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:238
 #, fuzzy
 msgid "Kick player"
 msgstr "Kunde inte sparka ut!"
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:643
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
 #, fuzzy
 msgid "Show Items"
 msgstr "Visa namn"
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:644
-#: src/gui/popupmenu.cpp:1869
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:273
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:277
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:288
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:294
 #, fuzzy
 msgid "Add to priority attack list"
 msgstr "@@attack|Attackera %s@@"
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:296
 #, fuzzy
 msgid "Add to attack list"
 msgstr "@@attack|Attackera %s@@"
 
-#: src/gui/popupmenu.cpp:295
+#: src/gui/popupmenu.cpp:299
 #, fuzzy
 msgid "Add to ignore list"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
 #, fuzzy
 msgid "Add name to chat"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:461
 #, fuzzy
 msgid "Pick up"
 msgstr "Plocka upp"
 
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:479
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "Rename"
 msgstr "Kom ihåg användarnamnet"
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
 #, fuzzy
 msgid "Remove"
 msgstr "Kom ihåg användarnamnet"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:495
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:513
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:514
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:536
+#: src/gui/popupmenu.cpp:540
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Flikmarkering"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:545
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Flikmarkering"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:550
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "Remove name"
 msgstr "Kom ihåg användarnamnet"
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:560
 #, fuzzy
 msgid "Enable away"
 msgstr "Kan inte köpa."
 
-#: src/gui/popupmenu.cpp:561
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "Disable away"
 msgstr "Tillåt/neka handel"
 
-#: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:715
 #, fuzzy
 msgid "Change guild position"
 msgstr "Ändra"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1124
+#: src/gui/popupmenu.cpp:1137
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1126
+#: src/gui/popupmenu.cpp:1139
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1507
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1541
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:1513
+#: src/gui/popupmenu.cpp:1547
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:1516
+#: src/gui/popupmenu.cpp:1550
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1518
+#: src/gui/popupmenu.cpp:1552
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1564
 #, fuzzy
 msgid "Store 10"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1567
 #, fuzzy
 msgid "Store half"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1535
+#: src/gui/popupmenu.cpp:1569
 #, fuzzy
 msgid "Store all"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
-#: src/gui/popupmenu.cpp:1693
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Drop all"
 msgstr "Släpp"
 
-#: src/gui/popupmenu.cpp:1574
+#: src/gui/popupmenu.cpp:1608
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1577
+#: src/gui/popupmenu.cpp:1611
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1613
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1743
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1741 src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1817
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1785
+#: src/gui/popupmenu.cpp:1819
 #, fuzzy
 msgid "Copy to chat"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 #, fuzzy
 msgid "(default)"
 msgstr "Förval"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 #, fuzzy
 msgid "Move up"
 msgstr "Gå uppåt"
 
-#: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
 #, fuzzy
 msgid "Move down"
 msgstr "Gå nedåt"
@@ -1822,125 +1843,123 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:68
+#: src/gui/setup_chat.cpp:55
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:58
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:61
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:64
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:73
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:92
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
 #, fuzzy
 msgid "Enable trade tab"
 msgstr "Kan inte köpa."
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:82
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:100
+#: src/gui/setup_chat.cpp:85
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:88
 #, fuzzy
 msgid "Enable battle tab"
 msgstr "Kan inte köpa."
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:91
 #, fuzzy
 msgid "Show battle events"
 msgstr "Visa namn"
 
-#: src/gui/setup_chat.cpp:112
-msgid "Show chat colors list"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:115 src/gui/setup_chat.cpp:123
-#: src/gui/setup_other.cpp:146 src/gui/setup_other.cpp:150
-#: src/gui/setup_players.cpp:332
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:118
-msgid "Limit max chars in chat line"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:127
-msgid "Limit max lines in chat"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:134
+#: src/gui/setup_chat.cpp:94
 #, fuzzy
 msgid "Resize chat tabs if need"
 msgstr "Nästa chattflik"
 
-#: src/gui/setup_colors.cpp:48
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Så här ser färgen ut"
 
-#: src/gui/setup_colors.cpp:53
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Färger"
 
-#: src/gui/setup_colors.cpp:74
+#: src/gui/setup_colors.cpp:75
 #, fuzzy
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:406
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
 msgstr "Statisk"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
 msgstr "Pulserande"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
 msgstr "Regnbåge"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:96 src/gui/setup_colors.cpp:318
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 #, fuzzy
 msgid "Delay:"
 msgstr "Fördröjning: "
 
-#: src/gui/setup_colors.cpp:111
+#: src/gui/setup_colors.cpp:112
 #, fuzzy
 msgid "Red:"
 msgstr "Röd: "
 
-#: src/gui/setup_colors.cpp:126
+#: src/gui/setup_colors.cpp:127
 #, fuzzy
 msgid "Green:"
 msgstr "Grön: "
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:142
 #, fuzzy
 msgid "Blue:"
 msgstr "Blå: "
 
-#: src/gui/setup_colors.cpp:313
+#: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
 msgstr ""
 
@@ -1952,6 +1971,11 @@ msgstr "Verkställ"
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Klicka på knappen för att starta kalibreringen"
@@ -1997,129 +2021,125 @@ msgstr "Förval"
 msgid "Key Conflict(s) Detected."
 msgstr "Samma tangent används på flera ställen."
 
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:40
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
-msgid "Auto target only reachable monsters"
-msgstr ""
-
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:49
 #, fuzzy
-msgid "Highlight map portals"
-msgstr "Markering"
-
-#: src/gui/setup_other.cpp:120
-msgid "Highlight player attack range"
-msgstr ""
+msgid "Enable server side attack"
+msgstr "Kan inte köpa."
 
-#: src/gui/setup_other.cpp:125
-msgid "Highlight monster attack range"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
-msgid "Cycle player targets"
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:58
 #, fuzzy
-msgid "Cycle monster targets"
-msgstr "Visa namn"
+msgid "Highlight map portals"
+msgstr "Markering"
 
-#: src/gui/setup_other.cpp:135
-#, fuzzy
-msgid "Enable bot checker"
-msgstr "Aktivera joystick"
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:64
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Markering"
 
-#: src/gui/setup_other.cpp:141
-msgid "Crazy move A program"
-msgstr ""
-
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:67
 #, fuzzy
-msgid "Enable shop mode"
-msgstr "Tillåt/neka handel"
+msgid "Enable quick stats"
+msgstr "Aktivera joystick"
 
-#: src/gui/setup_other.cpp:155
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:73
 #, fuzzy
-msgid "Enable debug log"
-msgstr "Kan inte köpa."
-
-#: src/gui/setup_other.cpp:161
-#, fuzzy
-msgid "Enable server side attack"
-msgstr "Kan inte köpa."
+msgid "Show warps particles"
+msgstr "som partikel"
 
-#: src/gui/setup_other.cpp:164
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:167
-msgid "Attack while moving"
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:170
-#, fuzzy
-msgid "Enable quick stats"
-msgstr "Aktivera joystick"
-
-#: src/gui/setup_other.cpp:173
-#, fuzzy
-msgid "Show warps particles"
-msgstr "som partikel"
-
-#: src/gui/setup_other.cpp:176
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:86
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:182
+#: src/gui/setup_other.cpp:89
+#, fuzzy
+msgid "Cycle monster targets"
+msgstr "Visa namn"
+
+#: src/gui/setup_other.cpp:92
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Visa namn"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:95
+#, fuzzy
+msgid "Enable bot checker"
+msgstr "Aktivera joystick"
+
+#: src/gui/setup_other.cpp:98
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:105
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:108
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:111
+#, fuzzy
+msgid "Afk message"
+msgstr "Meddelande"
+
+#: src/gui/setup_other.cpp:114
 #, fuzzy
 msgid "Enable attack filter"
 msgstr "Kan inte köpa."
 
-#: src/gui/setup_other.cpp:283
-msgid "Crazy Move A"
+#: src/gui/setup_other.cpp:117
+#, fuzzy
+msgid "Enable shop mode"
+msgstr "Tillåt/neka handel"
+
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:297
+#: src/gui/setup_other.cpp:123
 #, fuzzy
-msgid "Afk message"
-msgstr "Meddelande"
+msgid "Enable debug log"
+msgstr "Kan inte köpa."
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2514,12 +2534,12 @@ msgstr ""
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:718 src/net/manaserv/tradehandler.cpp:127
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "Förfrågan om byteshandel"
 
-#: src/gui/shopwindow.cpp:719
+#: src/gui/shopwindow.cpp:724
 #, fuzzy, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vill byteshandla med dig, accepterar du?"
@@ -4405,7 +4425,7 @@ msgstr "Tack för köpet."
 msgid "Unable to buy."
 msgstr "Kan inte köpa."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:252
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
 msgid "Strength"
 msgstr "Styrka"
 
@@ -4414,7 +4434,7 @@ msgstr "Styrka"
 msgid "Strength %+.1f"
 msgstr "Styrka %+d"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:253
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
 msgid "Agility"
 msgstr "Smidighet"
 
@@ -4423,7 +4443,7 @@ msgstr "Smidighet"
 msgid "Agility %+.1f"
 msgstr "Smidighet %+d"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:256
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
 msgid "Dexterity"
 msgstr "Skicklighet"
 
@@ -4432,7 +4452,7 @@ msgstr "Skicklighet"
 msgid "Dexterity %+.1f"
 msgstr "Skicklighet %+d"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:254
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
 msgid "Vitality"
 msgstr "Hälsa"
 
@@ -4441,7 +4461,7 @@ msgstr "Hälsa"
 msgid "Vitality %+.1f"
 msgstr "Livskraft %+d"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:255
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
 msgid "Intelligence"
 msgstr "Intelligens"
 
@@ -5011,55 +5031,55 @@ msgstr "Dubbel inloggning"
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel"
 
-#: src/net/tmwa/generalhandler.cpp:225
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr "Kopplades från servern!"
 
-#: src/net/tmwa/generalhandler.cpp:257
+#: src/net/tmwa/generalhandler.cpp:262
 msgid "Luck"
 msgstr "Tur"
 
-#: src/net/tmwa/generalhandler.cpp:260
+#: src/net/tmwa/generalhandler.cpp:265
 #, fuzzy
 msgid "Defense"
 msgstr "Försvar:"
 
-#: src/net/tmwa/generalhandler.cpp:261
+#: src/net/tmwa/generalhandler.cpp:266
 #, fuzzy
 msgid "M.Attack"
 msgstr "M. attack:"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:267
 #, fuzzy
 msgid "M.Defense"
 msgstr "M. försvar:"
 
-#: src/net/tmwa/generalhandler.cpp:263
+#: src/net/tmwa/generalhandler.cpp:268
 #, fuzzy
 msgid "% Accuracy"
 msgstr "% Träffsäkerhet:"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:269
 #, fuzzy
 msgid "% Evade"
 msgstr "% Kringgå:"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:270
 #, fuzzy
 msgid "% Critical"
 msgstr "Kritisk träff"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:271
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Attack %+d"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:273
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Attack %+d"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
 #, fuzzy
 msgid "Attack Range"
 msgstr "Monster slår spelare"
@@ -5955,9 +5975,6 @@ msgstr "Okänt föremål"
 #~ msgid "If <channel> doesn't exist, it's created."
 #~ msgstr "Om <chattkanal> inte existerar, skapas den."
 
-#~ msgid "Command: /list"
-#~ msgstr "Kommando: /list"
-
 #~ msgid "This command shows a list of all channels."
 #~ msgstr "Det här kommandot visar en lista över alla chattkanaler."