1 files changed, 182 insertions, 173 deletions

diff --git a/po/manaplus.pot b/po/manaplus.pot
index 71dab2b00..7ee024294 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-04-22 00:47+0300\n"
+"POT-Creation-Date: 2011-04-27 22:33+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 msgid "Visible on map"
 msgstr ""
 
@@ -30,87 +30,87 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:93
+#: src/client.cpp:748 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
+#: src/client.cpp:1054 src/client.cpp:1061 src/client.cpp:1198
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
-#: src/gui/charcreatedialog.cpp:211 src/gui/register.cpp:226
-#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
+#: src/gui/charcreatedialog.cpp:216 src/gui/register.cpp:226
+#: src/gui/serverdialog.cpp:373 src/gui/unregisterdialog.cpp:135
 #: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
 #: src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1143
+#: src/client.cpp:1139
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
+#: src/client.cpp:1328 src/client.cpp:1358 src/client.cpp:1402
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1535
+#: src/client.cpp:1531
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -363,7 +363,7 @@ msgid "Buy"
 msgstr ""
 
 #: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
-#: src/gui/sell.cpp:320
+#: src/gui/sell.cpp:322
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -386,7 +386,7 @@ msgstr ""
 
 #: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
-#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
+#: src/gui/serverdialog.cpp:264 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr ""
 
@@ -409,12 +409,12 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
 #: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1417
-#: src/gui/popupmenu.cpp:1444 src/gui/popupmenu.cpp:1489
-#: src/gui/popupmenu.cpp:1527 src/gui/popupmenu.cpp:1562
-#: src/gui/popupmenu.cpp:1596 src/gui/popupmenu.cpp:1639
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1494
+#: src/gui/popupmenu.cpp:1521 src/gui/popupmenu.cpp:1566
+#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1676 src/gui/popupmenu.cpp:1740
 #: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
-#: src/gui/socialwindow.cpp:921 src/gui/textcommandeditor.cpp:234
+#: src/gui/socialwindow.cpp:956 src/gui/textcommandeditor.cpp:234
 #: src/gui/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
 #: src/gui/updatewindow.cpp:155
 msgid "Cancel"
@@ -514,8 +514,8 @@ msgstr ""
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:981
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:449
+#: src/gui/socialwindow.cpp:1016
 msgid "Create"
 msgstr ""
 
@@ -527,20 +527,20 @@ msgstr ""
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:111 src/gui/charcreatedialog.cpp:293
+#: src/gui/charcreatedialog.cpp:111 src/gui/charcreatedialog.cpp:298
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -570,22 +570,22 @@ msgstr ""
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
+#: src/gui/charselectdialog.cpp:379 src/gui/serverdialog.cpp:268
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr ""
 
@@ -798,8 +798,8 @@ msgstr ""
 
 #: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
-#: src/gui/popupmenu.cpp:1504
+#: src/gui/popupmenu.cpp:1458 src/gui/popupmenu.cpp:1541
+#: src/gui/popupmenu.cpp:1581
 msgid "Unequip"
 msgstr ""
 
@@ -842,26 +842,26 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
-#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1460
+#: src/gui/popupmenu.cpp:1543 src/gui/popupmenu.cpp:1583
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1386
-#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1470
-#: src/gui/popupmenu.cpp:1509
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1463
+#: src/gui/popupmenu.cpp:1516 src/gui/popupmenu.cpp:1547
+#: src/gui/popupmenu.cpp:1586
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
-#: src/gui/popupmenu.cpp:1512
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1551
+#: src/gui/popupmenu.cpp:1589
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
-#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1471
+#: src/gui/popupmenu.cpp:1556 src/gui/popupmenu.cpp:1594
 msgid "Split"
 msgstr ""
 
@@ -875,18 +875,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
-#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1439 src/gui/popupmenu.cpp:1559
+#: src/gui/popupmenu.cpp:1597 src/gui/setup.cpp:66
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1391
-#: src/gui/popupmenu.cpp:1476 src/gui/popupmenu.cpp:1514
-#: src/gui/windowmenu.cpp:92
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1468
+#: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1591
+#: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr ""
 
@@ -1065,7 +1065,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:88 src/gui/serverdialog.cpp:227
+#: src/gui/login.cpp:88 src/gui/serverdialog.cpp:231
 #: src/gui/widgets/chattab.cpp:171
 msgid "Server:"
 msgstr ""
@@ -1319,12 +1319,12 @@ msgstr ""
 msgid "@@admin-kick|Kick@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:262
 msgid "@@remove attack|Remove from attack list@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265
-msgid "@@remove attack|Remove from ignore list@@"
+#: src/gui/popupmenu.cpp:267
+msgid "@@add attack priority|Add to priority attack list@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:270
@@ -1376,7 +1376,7 @@ msgstr ""
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr ""
 
@@ -1437,81 +1437,86 @@ msgstr ""
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
-#: src/gui/popupmenu.cpp:1521
+#: src/gui/popupmenu.cpp:1492 src/gui/popupmenu.cpp:1560
+#: src/gui/popupmenu.cpp:1598
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
+#: src/gui/popupmenu.cpp:1519 src/gui/popupmenu.cpp:1564
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1525
+#: src/gui/popupmenu.cpp:1602
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
+#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
-#: src/gui/socialwindow.cpp:872
+#: src/gui/popupmenu.cpp:1674
+msgid "Reset yellow bar"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1692 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872 src/gui/socialwindow.cpp:907
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 msgid "Move down"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1735
 msgid "Remove"
 msgstr ""
 
@@ -1559,60 +1564,60 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:235
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:513
+#: src/gui/serverdialog.cpp:521
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:526
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:522
+#: src/gui/serverdialog.cpp:530
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:526
+#: src/gui/serverdialog.cpp:534
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:624
+#: src/gui/serverdialog.cpp:632
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:634
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2025,8 +2030,8 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
-#: src/gui/setup_video.cpp:722
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:720
+#: src/gui/setup_video.cpp:725
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2177,7 +2182,7 @@ msgid "FPS limit:"
 msgstr ""
 
 #: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
+#: src/gui/setup_video.cpp:651 src/gui/setup_video.cpp:815
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -2206,58 +2211,58 @@ msgid "Font size"
 msgstr ""
 
 #: src/gui/setup_video.cpp:350 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:648 src/gui/setup_video.cpp:799
-#: src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:650 src/gui/setup_video.cpp:802
+#: src/gui/setup_video.cpp:813
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:531
+#: src/gui/setup_video.cpp:533
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:539
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:700
+#: src/gui/setup_video.cpp:703
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:701
+#: src/gui/setup_video.cpp:704
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
+#: src/gui/setup_video.cpp:719 src/gui/setup_video.cpp:724
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:722
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:756
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr ""
 
@@ -2401,124 +2406,128 @@ msgid "Atk"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:823
-msgid "Selected mobs"
+msgid "Priority mobs"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:855
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:890
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1228
+#: src/gui/socialwindow.cpp:1263
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1242
+#: src/gui/socialwindow.cpp:1277
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1371
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1341
+#: src/gui/socialwindow.cpp:1376
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr ""
 
@@ -3342,11 +3351,11 @@ msgstr ""
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr ""
 
@@ -3444,31 +3453,31 @@ msgstr ""
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:84
+#: src/gui/windowmenu.cpp:85
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:91
+#: src/gui/windowmenu.cpp:93
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:94
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SET"
 msgstr ""
 
@@ -3869,68 +3878,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1347
+#: src/localplayer.cpp:1365
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1349
+#: src/localplayer.cpp:1367
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1351
+#: src/localplayer.cpp:1369
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1353
+#: src/localplayer.cpp:1371
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1356
+#: src/localplayer.cpp:1374
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1359
+#: src/localplayer.cpp:1377
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1384
+#: src/localplayer.cpp:1402
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3110
+#: src/localplayer.cpp:3132
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3408
+#: src/localplayer.cpp:3430
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
+#: src/localplayer.cpp:3432 src/localplayer.cpp:3447
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 msgid "You see "
 msgstr ""
 
@@ -5055,35 +5064,35 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:332 src/net/tmwa/playerhandler.cpp:342
-#: src/net/tmwa/playerhandler.cpp:421
+#: src/net/tmwa/playerhandler.cpp:340 src/net/tmwa/playerhandler.cpp:350
+#: src/net/tmwa/playerhandler.cpp:429
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:341
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/tmwa/playerhandler.cpp:351
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:499
+#: src/net/tmwa/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:619
+#: src/net/tmwa/playerhandler.cpp:627
 msgid "Equip arrows first."
 msgstr ""