Update and rebuild translations.

1 files changed, 454 insertions, 467 deletions

diff --git a/po/fa.po b/po/fa.po
index b6d2e5ef4..47a7f34c5 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "خطا"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -322,35 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "کلی"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "خطای شبکه"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,20 +384,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -410,8 +410,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -455,14 +455,13 @@ msgid "Max"
 msgstr "حداکثر"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -470,18 +469,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -587,7 +586,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "بساز"
 
@@ -602,7 +601,7 @@ msgstr "زن"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -758,7 +757,7 @@ msgstr "چت"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -771,13 +770,9 @@ msgstr "بلی"
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -942,7 +937,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -988,13 +983,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "تجهیزات"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1022,7 +1017,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1036,31 +1031,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1069,18 +1064,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1129,7 +1124,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1323,11 +1318,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1349,7 +1344,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1362,362 +1357,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2340,11 +2303,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2767,158 +2730,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3442,7 +3417,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3521,175 +3496,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4246,79 +4233,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4334,7 +4321,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4356,7 +4343,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4368,341 +4355,341 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5377,36 +5364,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5960,15 +5947,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""