1 files changed, 312 insertions, 292 deletions

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"