16 files changed, 3046 insertions, 2812 deletions

diff --git a/po/da.po b/po/da.po
index 94ba54d0a..66e15cb3e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-22 00:47+0300\n"
+"POT-Creation-Date: 2011-04-27 22:33+0300\n"
 "PO-Revision-Date: 2009-07-25 17:33+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 #, fuzzy
 msgid "Visible on map"
 msgstr "Synlige navne"
@@ -32,95 +32,95 @@ 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 "Opsætning"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Opretter forbindelse til kort-serveren..."
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 #, fuzzy
 msgid "Logging in"
 msgstr "Log Ind"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Vælg Karakter"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Opretter forbindelse til kort-serveren..."
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: 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 "Fejl"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Password Change"
 msgstr "Adgangskode:"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 #, fuzzy
 msgid "Email Change"
 msgstr "Ændre"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Frameld"
 
-#: 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
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ugyldig opdaterings host: "
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Buy"
 msgstr "Køb"
 
 #: 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 "Pris: %s / Total: %s"
@@ -412,7 +412,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 "Afslut"
 
@@ -435,12 +435,12 @@ msgstr "Sælg"
 #: 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"
@@ -545,8 +545,8 @@ msgstr "Frisure:"
 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 "Opret"
 
@@ -558,20 +558,20 @@ msgstr "Mand"
 msgid "Female"
 msgstr "Kvinde"
 
-#: 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 "Du mangler at fordele %d points"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dit navn skal være mindst 4 bogstaver langt."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Du har brugt alle dine points"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Du skal fjerne %d points"
@@ -602,23 +602,23 @@ msgstr "Frameld"
 msgid "Change Email"
 msgstr "Skift e-mail adresse"
 
-#: 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 "Slet"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 #, fuzzy
 msgid "Choose"
 msgstr "Luk"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, fuzzy, c-format
 msgid "Level %d"
 msgstr "Niveau: %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr ""
 
@@ -852,8 +852,8 @@ msgstr "Udstyr"
 
 #: 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 "Tag af"
 
@@ -899,27 +899,27 @@ 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 "Tag på"
 
 #: 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 "Brug"
 
 #: 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
 #, fuzzy
 msgid "Drop..."
 msgstr "Smid"
 
-#: 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 "Opdel"
 
@@ -933,18 +933,18 @@ msgid "Weight:"
 msgstr "Vægt:"
 
 #: 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 "Gem på lager"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
-#: 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 "Smid"
 
@@ -1131,7 +1131,7 @@ msgstr ""
 msgid "Login"
 msgstr "Log Ind"
 
-#: 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 "Server:"
@@ -1411,13 +1411,14 @@ msgstr "@@attack|Angrib %s@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Spark spiller ud@@"
 
-#: 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@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:267
+#, fuzzy
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|Angrib %s@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1472,7 +1473,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 ""
 
@@ -1540,95 +1541,100 @@ msgstr ""
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 #, fuzzy
 msgid "Store 10"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 #, fuzzy
 msgid "Store half"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 #, fuzzy
 msgid "Store all"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Hent fra lager"
 
-#: 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
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "Standard"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Flyt op"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Flyt ned"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Husk Brugernavn"
@@ -1677,65 +1683,65 @@ msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 msgid "Passwords do not match."
 msgstr "De indtastede adgangskoder stemmer ikke overens."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Vælg din server"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Port:"
 
-#: 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
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 #, fuzzy
 msgid "Connect"
 msgstr "Opretter forbindelse..."
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 #, fuzzy
 msgid "Custom Server"
 msgstr "Brugerdefineret cursor"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Skriv både adressen og porten på serveren."
 
-#: 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
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Venter på serveren"
 
-#: 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 ""
@@ -2179,8 +2185,8 @@ msgstr "Hjælp"
 msgid "Theme Changed"
 msgstr "Ændre"
 
-#: 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 "Ændringerne kræver at du genstarter klienten."
 
@@ -2341,7 +2347,7 @@ msgid "FPS limit:"
 msgstr "FPS-grænse:"
 
 #: 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
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS-grænse:"
@@ -2372,65 +2378,65 @@ msgid "Font size"
 msgstr "Skriftstørrelse"
 
 #: 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
 #, fuzzy
 msgid "None"
 msgstr "Nej"
 
-#: src/gui/setup_video.cpp:531
+#: src/gui/setup_video.cpp:533
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
 
-#: src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:539
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Skifter til fuld skærm"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Skrifter til OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: 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
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Skærmopløsning ændret"
 
-#: 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
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Ændrede Partikeleffekter."
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "Ændringerne træder i kraft når du er går til et nyt kort."
 
@@ -2577,135 +2583,139 @@ msgid "Atk"
 msgstr "Angrib"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Vælg OK"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Angrib"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Ignorer"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 #, fuzzy
 msgid "Create Party"
 msgstr "Lav en ny karakter."
 
-#: 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
 #, fuzzy
 msgid "Invite"
 msgstr "Inviter en spiller"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Du har accepteret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Du har ignoreret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Du har accepteret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Du har ignoreret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
 
-#: 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
 #, fuzzy
 msgid "Guild Name"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Vælg din server"
 
-#: 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
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har inviteret med i %s's gruppe."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accepter invitationen"
 
-#: 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
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s har inviteret med i sin gruppe"
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s har inviteret med i %s's gruppe."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har inviteret med i sin gruppe"
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har inviteret med i %s's gruppe."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Accepter invitationen"
 
-#: 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
 #, fuzzy
 msgid "Party Name"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Vælg din server"
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr ""
 
@@ -3575,11 +3585,11 @@ msgstr "Kommando: /kick <navn>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Denne kommando sparker <navn> ud af kanalen"
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Du glemte at skrive navnet på den bruger der skal blive operator"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr ""
 "Du glemte at skrive navnet på den bruger der skal sparkes ud af kanalen"
@@ -3687,32 +3697,32 @@ 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
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Genvej"
 
-#: 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 ""
 
@@ -4140,73 +4150,73 @@ msgid ""
 "strange behaviour."
 msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Du kunne ikke bruge denne genstand."
 
-#: 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
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Serveren er fuld"
 
-#: 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
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Du samlede %s [@@%d|%s@@] op."
 msgstr[1] "Du samlede %s [@@%d|%s@@] op."
 
-#: 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
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Handel annulleret."
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 #, fuzzy
 msgid "Imitation: "
 msgstr "Skift e-mail adresse"
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Handel annulleret."
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 #, fuzzy
 msgid "You see "
 msgstr "Du får %s."
@@ -5435,35 +5445,35 @@ msgstr "Du er en forhenværende spiller."
 msgid "You're pining for the fjords."
 msgstr "Du er tabt bag en vogn."
 
-#: 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 "Besked"
 
-#: 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
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Du samlede op "
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Du får %s."
 
-#: 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 ""
 
@@ -5644,6 +5654,10 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Ukendt genstand"
 
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Vælg OK"
+
 #~ msgid "-- Help --"
 #~ msgstr "--Hjælp--"
 
diff --git a/po/de.po b/po/de.po
index d2688d5e3..541a7cd9e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-22 00:47+0300\n"
+"POT-Creation-Date: 2011-04-27 22:33+0300\n"
 "PO-Revision-Date: 2010-01-02 15:26+0000\n"
 "Last-Translator: Jonathan Raphael Joachim Kolberg\n"
 "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 #, fuzzy
 msgid "Visible on map"
 msgstr "Sichtbare Namen"
@@ -51,94 +51,94 @@ msgstr ""
 msgid "miss"
 msgstr "verfehlt"
 
-#: 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 "Einstellungen"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Verbinde mit [Benutzerdatenserver]..."
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 #, fuzzy
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Spielfigur auswählen"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Verbinde mit [Charakterserver]..."
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Wechsle den Server"
 
-#: 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 "Fehler"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr "Fordere Registrierungsdetails an"
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 msgid "Password Change"
 msgstr "Passwort ändern:"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Mitglied wurde erfolgreich Befördert."
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Abmelden"
 
-#: src/client.cpp:1143
+#: src/client.cpp:1139
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: 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 "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/client.cpp:1535
+#: src/client.cpp:1531
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: "
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, fuzzy, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
@@ -412,7 +412,7 @@ msgid "Buy"
 msgstr "Kaufen"
 
 #: 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 "Preis: %s / Gesamt: %s"
@@ -435,7 +435,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 "Beenden"
 
@@ -458,12 +458,12 @@ msgstr "Verkaufen"
 #: 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"
@@ -563,8 +563,8 @@ msgstr "Frisur:"
 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 "Erstellen"
 
@@ -576,20 +576,20 @@ msgstr "Männlich"
 msgid "Female"
 msgstr "Weiblich"
 
-#: 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 "Bitte verteile %d Punkte"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Spielfigurattribute OK"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -619,22 +619,22 @@ msgstr "Abmelden"
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
-#: 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 "Löschen"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 msgid "Choose"
 msgstr "Wähle"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, c-format
 msgid "Level %d"
 msgstr "Stufe: %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr "(leer)"
 
@@ -864,8 +864,8 @@ msgstr "Ausrüstung"
 
 #: 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 "Ablegen"
 
@@ -911,26 +911,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 "Ausrüsten"
 
 #: 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 "Benutzen"
 
 #: 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 "Wegwerfen"
 
-#: 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 "Aufteilen"
 
@@ -944,18 +944,18 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: 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 "Einlagern"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: 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 "Wegwerfen"
 
@@ -1142,7 +1142,7 @@ msgstr ""
 msgid "Login"
 msgstr "Anmelden"
 
-#: 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 "Server:"
@@ -1409,13 +1409,14 @@ 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@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:267
+#, fuzzy
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "Zu Chat hinzufügen"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1469,7 +1470,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 ""
 
@@ -1536,95 +1537,100 @@ msgstr ""
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 #, fuzzy
 msgid "Add to trade"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 #, fuzzy
 msgid "Store 10"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 #, fuzzy
 msgid "Store half"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 #, fuzzy
 msgid "Store all"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Abholen"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Abholen"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Abholen"
 
-#: 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 "Zu Chat hinzufügen"
 
-#: 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
 #, fuzzy
 msgid "Show"
 msgstr "Zeigen"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "Standard"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Laufe Hoch"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Laufe Runter"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Benutzername merken"
@@ -1673,63 +1679,63 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Port:"
 
-#: 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
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: 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 "Verbinde..."
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 #, fuzzy
 msgid "Custom Server"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
-#: src/gui/serverdialog.cpp:513
+#: src/gui/serverdialog.cpp:521
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:526
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:522
+#: src/gui/serverdialog.cpp:530
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
-#: src/gui/serverdialog.cpp:526
+#: src/gui/serverdialog.cpp:534
 #, fuzzy
 msgid "Error retreiving server list!"
 msgstr "Fehler beim empfangen der Serverliste: %s\n"
 
-#: src/gui/serverdialog.cpp:624
+#: src/gui/serverdialog.cpp:632
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:634
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -2164,8 +2170,8 @@ msgstr "Hilfe"
 msgid "Theme Changed"
 msgstr "E-Mail ändern"
 
-#: 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 "Starte das Spiel neu um die Änderungen zu übernehmen."
 
@@ -2326,7 +2332,7 @@ msgid "FPS limit:"
 msgstr "FPS-Limit:"
 
 #: 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
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS-Limit:"
@@ -2357,69 +2363,69 @@ msgid "Font size"
 msgstr "Schriftgröße"
 
 #: 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
 #, fuzzy
 msgid "None"
 msgstr "Nein"
 
-#: src/gui/setup_video.cpp:531
+#: src/gui/setup_video.cpp:533
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "und Wiederherstellung der alten Auflösung schlug fehl!"
 
-#: src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:539
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "und Wiederherstellung der alten Auflösung schlug fehl!"
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Ändere OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: 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
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Auflösung geändert"
 
-#: src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:722
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
 "anzupassen."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:756
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Partikeleffekteinstellungen geändert."
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
@@ -2568,134 +2574,138 @@ msgid "Atk"
 msgstr "Angriff"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "OK auswählen"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Angriff"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Ignoriere %s"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 #, fuzzy
 msgid "Create Party"
 msgstr "Charakter erstellen"
 
-#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
 #, fuzzy
 msgid "Social"
 msgstr "Special"
 
-#: src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017
 #, fuzzy
 msgid "Invite"
 msgstr "einladen"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 #, fuzzy
 msgid "Leave"
 msgstr "Stufe: %d"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:1228
+#: src/gui/socialwindow.cpp:1263
 #, fuzzy, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:1242
+#: src/gui/socialwindow.cpp:1277
 msgid "Guild Name"
 msgstr "Gildenname"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Nehme Partyeinladung an"
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1371
 msgid "Cannot create party. You are already in a party"
 msgstr "Konnte keine Partie erstellen. Du bist schon in einer Partie."
 
-#: src/gui/socialwindow.cpp:1341
+#: src/gui/socialwindow.cpp:1376
 #, fuzzy
 msgid "Party Name"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr "Special"
 
@@ -3566,11 +3576,11 @@ msgstr "Befehl: /kick <Name>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Diese Befehl wirft Spieler <Name> aus dem Kanal"
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Gib einen Spieler an, der Moderator werden soll!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Gib einen Spieler an, der aus dem Kanal geworfen werden soll"
 
@@ -3675,32 +3685,32 @@ 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
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Tastenkürzel"
 
-#: 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 ""
 
@@ -4129,74 +4139,74 @@ msgid ""
 "strange behaviour."
 msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Kann das nicht aufheben."
 
-#: 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
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Server ist voll"
 
-#: 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
 #, fuzzy
 msgid "Unknown problem picking up item."
 msgstr "Kann das nicht aufheben."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1384
+#: src/localplayer.cpp:1402
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Du hast %s [@@%d|%s@@] aufgehoben."
 msgstr[1] "Du hast %s [@@%d|%s@@] aufgehoben."
 
-#: src/localplayer.cpp:3110
+#: src/localplayer.cpp:3132
 msgid "Away"
 msgstr "Abwesend"
 
-#: 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
 #, fuzzy
 msgid "Follow canceled"
 msgstr " abgebrochen"
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 #, fuzzy
 msgid "Imitation: "
 msgstr "Email-Adresse ändern"
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 #, fuzzy
 msgid "Imitation canceled"
 msgstr " abgebrochen"
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 #, fuzzy
 msgid "You see "
 msgstr "Du erhältst %s."
@@ -5397,40 +5407,40 @@ msgstr "Du warst einmal ein Spieler."
 msgid "You're pining for the fjords."
 msgstr "Du schmachtest nach den Fjorden."
 
-#: 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 "Nachricht"
 
-#: 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 ""
 "Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
 "heilen."
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
 "heilen."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, c-format
 msgid "You picked up %s."
 msgstr "Du hast %s aufgehoben "
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Du erhältst %s."
 
-#: src/net/tmwa/playerhandler.cpp:499
+#: src/net/tmwa/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr "Kann Skill nicht erhöhen!"
 
-#: src/net/tmwa/playerhandler.cpp:619
+#: src/net/tmwa/playerhandler.cpp:627
 msgid "Equip arrows first."
 msgstr "Rüste dich zuerst mit Pfeilen aus."
 
@@ -5611,6 +5621,10 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "OK auswählen"
+
 #~ msgid "-- Help --"
 #~ msgstr "-- Hilfe --"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 25f0c49ab..3119747a3 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-22 00:47+0300\n"
+"POT-Creation-Date: 2011-04-27 22:33+0300\n"
 "PO-Revision-Date: 2010-03-04 21:01+0000\n"
 "Last-Translator: issyl0 <isabell121@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 #, fuzzy
 msgid "Visible on map"
 msgstr "Visible names"
@@ -32,96 +32,96 @@ 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 "Setup"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Connecting to map server..."
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 #, fuzzy
 msgid "Logging in"
 msgstr "Login"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Select Character"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Connecting to map server..."
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: 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 "Error"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Password Change"
 msgstr "Password:"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 #, fuzzy
 msgid "Email Change"
 msgstr "Change"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Member was promoted successfully."
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Unregister"
 
-#: 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
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalid update host: "
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -392,7 +392,7 @@ msgid "Buy"
 msgstr "Buy"
 
 #: 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 "Price: %s / Total: %s"
@@ -415,7 +415,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 "Exit"
 
@@ -438,12 +438,12 @@ msgstr "Sell"
 #: 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"
@@ -548,8 +548,8 @@ msgstr "Hair Style:"
 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 "Create"
 
@@ -561,20 +561,20 @@ msgstr "Male"
 msgid "Female"
 msgstr "Female"
 
-#: 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 "Please distribute %d points"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Your name needs to be at least 4 characters."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Character stats OK"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Please remove %d points"
@@ -605,23 +605,23 @@ msgstr "Unregister"
 msgid "Change Email"
 msgstr "Change Email Address"
 
-#: 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 "Delete"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 #, fuzzy
 msgid "Choose"
 msgstr "Close"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, fuzzy, c-format
 msgid "Level %d"
 msgstr "Level: %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr ""
 
@@ -855,8 +855,8 @@ msgstr "Equipment"
 
 #: 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 "Unequip"
 
@@ -902,27 +902,27 @@ 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 "Equip"
 
 #: 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 "Use"
 
 #: 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
 #, fuzzy
 msgid "Drop..."
 msgstr "Drop"
 
-#: 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 "Split"
 
@@ -936,18 +936,18 @@ msgid "Weight:"
 msgstr "Weight:"
 
 #: 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 "Store"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#: 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 "Drop"
 
@@ -1134,7 +1134,7 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: 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 "Server:"
@@ -1415,13 +1415,14 @@ msgstr "@@attack|Attack %s@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: 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@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:267
+#, fuzzy
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|Attack %s@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1476,7 +1477,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 ""
 
@@ -1544,95 +1545,100 @@ msgstr ""
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 #, fuzzy
 msgid "Store 10"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 #, fuzzy
 msgid "Store half"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 #, fuzzy
 msgid "Store all"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Retrieve"
 
-#: 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
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Add to chat@@"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "Default"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Move Up"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Move Down"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Remember Username"
@@ -1681,65 +1687,65 @@ msgstr "The password needs to be less than %d characters long."
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Choose your server"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Port:"
 
-#: 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
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 #, fuzzy
 msgid "Connect"
 msgstr "Connecting..."
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 #, fuzzy
 msgid "Custom Server"
 msgstr "Custom cursor"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Please type both the address and the port of a server."
 
-#: 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
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Waiting for server"
 
-#: 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 ""
@@ -2183,8 +2189,8 @@ msgstr "Help"
 msgid "Theme Changed"
 msgstr "Change"
 
-#: 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 "Restart your client for the change to take effect."
 
@@ -2345,7 +2351,7 @@ msgid "FPS limit:"
 msgstr "FPS Limit:"
 
 #: 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
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS Limit:"
@@ -2376,65 +2382,65 @@ msgid "Font size"
 msgstr "Font size"
 
 #: 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
 #, fuzzy
 msgid "None"
 msgstr "No"
 
-#: src/gui/setup_video.cpp:531
+#: src/gui/setup_video.cpp:533
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "mode and restoration of old mode also failed!"
 
-#: src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:539
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "mode and restoration of old mode also failed!"
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Switching to full screen"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Changing OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: 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
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Screen resolution changed"
 
-#: 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
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Particle effect settings changed."
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "Changes will take effect on map change."
 
@@ -2581,136 +2587,140 @@ msgid "Atk"
 msgstr "Attack"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Select OK"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Attack"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Ignored"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Create Guild"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 #, fuzzy
 msgid "Create Party"
 msgstr "Create Character"
 
-#: 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
 #, fuzzy
 msgid "Invite"
 msgstr "Invite User"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 #, fuzzy
 msgid "Leave"
 msgstr "Large"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepted invite from %s."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejected invite from %s."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepted invite from %s."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejected invite from %s."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Error creating guild."
 
-#: 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
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Choose your server"
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Received party request, but one already exists."
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s has invited you to join the %s party."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr "Received party request, but one already exists."
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s has invited you to join their party."
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s has invited you to join the %s party."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s has invited you to join their party."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s has invited you to join the %s party."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Accept Party Invite"
 
-#: 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
 #, fuzzy
 msgid "Party Name"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Choose your server"
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr ""
 
@@ -3572,11 +3582,11 @@ msgstr "Command: /kick <nick>"
 msgid "This command makes <nick> leave the channel."
 msgstr "This command makes <nick> leave the channel."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Need a user to op!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Need a user to kick!"
 
@@ -3680,32 +3690,32 @@ 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
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Shortcut"
 
-#: 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 ""
 
@@ -4133,74 +4143,74 @@ msgid ""
 "strange behaviour."
 msgstr "Resolve them, or gameplay may result in strange behaviour."
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Unable to pick up item."
 
-#: 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
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Server is full"
 
-#: 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
 #, fuzzy
 msgid "Unknown problem picking up item."
 msgstr "Unable to pick up item."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1384
+#: src/localplayer.cpp:1402
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "You picked up %s [@@%d|%s@@]."
 msgstr[1] "You picked up %s [@@%d|%s@@]."
 
-#: 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
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Trade canceled."
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 #, fuzzy
 msgid "Imitation: "
 msgstr "Change Email Address"
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Trade canceled."
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 #, fuzzy
 msgid "You see "
 msgstr "You get %s."
@@ -5434,40 +5444,40 @@ msgstr "You are an ex-player."
 msgid "You're pining for the fjords."
 msgstr "You're pining for the fjords."
 
-#: 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 "Message"
 
-#: 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 ""
 "You are carrying more than half your maximum load. You are unable to "
 "automatically regain health."
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "You are carrying more than half your maximum load. You are unable to "
 "automatically regain health."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "You picked up "
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "You get %s."
 
-#: 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 "Equip arrows first."
 
@@ -5646,6 +5656,10 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Unknown item"
 
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Select OK"
+
 #~ msgid "-- Help --"
 #~ msgstr "-- Help --"
 
diff --git a/po/es.po b/po/es.po
index 9367069ef..2279dfa72 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\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: 2011-04-15 17:45+0000\n"
 "Last-Translator: nelson6e65 <nelson6eeduardo65@gmail.com>\n"
 "Language-Team: Spanish (Castilian) <>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
@@ -29,87 +29,87 @@ msgstr "evade"
 msgid "miss"
 msgstr "falla"
 
-#: 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 "Configuración"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr "Entrando al juego"
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 msgid "Requesting characters"
 msgstr "Cargando jugadores"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 msgid "Changing game servers"
 msgstr "Cambiando el servidor del juego"
 
-#: 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 "Error"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr "Detalles de registración"
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 msgid "Password Change"
 msgstr "Cambiar contraseña"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr "¡La contraseña se cambió correctamente!"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 msgid "Email Change"
 msgstr "Cambiar e-mail"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 msgid "Email changed successfully!"
 msgstr "¡Email modificado correctamente!"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1143
+#: src/client.cpp:1139
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: 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 "¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/client.cpp:1535
+#: src/client.cpp:1531
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de actualización inválido: %s"
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "¡Error creando la carpeta de actualizaciones!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
@@ -365,7 +365,7 @@ msgid "Buy"
 msgstr "Comprar"
 
 #: 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 "Precio: %s / Total: %s"
@@ -388,7 +388,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 "Salir"
 
@@ -411,12 +411,12 @@ msgstr "Vender"
 #: 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"
@@ -516,8 +516,8 @@ msgstr "Estilo del cabello:"
 msgid "Race:"
 msgstr "Race:"
 
-#: 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 "Crear"
 
@@ -529,20 +529,20 @@ msgstr "Hombre"
 msgid "Female"
 msgstr "Mujer"
 
-#: 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 "Por favor distribuya %d puntos"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Su nombre debe de tener como mínimo 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Puntos de estado del jugador correctamente asignados"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor extraiga %d puntos de estado"
@@ -572,22 +572,22 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Cambiar e-mail"
 
-#: 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 "Borrar"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, c-format
 msgid "Level %d"
 msgstr "Nivel: %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr "(vacío)"
 
@@ -800,8 +800,8 @@ msgstr "Equipamento"
 
 #: 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 "Quitárselo"
 
@@ -844,26 +844,26 @@ msgid "id"
 msgstr "id"
 
 #: 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 "Equipar"
 
 #: 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 "Usar"
 
 #: 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 "Tirar..."
 
-#: 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 "Dividir"
 
@@ -877,18 +877,18 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: 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 "Almacenar"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: 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 "Tirar"
 
@@ -1068,7 +1068,7 @@ msgstr "Saltar"
 msgid "Login"
 msgstr "Login"
 
-#: 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 "Servidor:"
@@ -1322,15 +1322,15 @@ msgstr "@@talk|Hablar@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Sacar@@"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:262
 #, fuzzy
 msgid "@@remove attack|Remove from attack list@@"
 msgstr "@@remove map|Quitar@@"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:267
 #, fuzzy
-msgid "@@remove attack|Remove from ignore list@@"
-msgstr "@@remove map|Quitar@@"
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|Ataque@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1382,7 +1382,7 @@ msgstr "@@remove map|Quitar@@"
 msgid "@@load old outfits|Load old outfits@@"
 msgstr "@@load old outfits|Cargar los vestidos antiguos@@"
 
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr "Hechizos"
 
@@ -1443,84 +1443,89 @@ msgstr "Renombrar señal del mapa"
 msgid "Name:                    "
 msgstr "Nombre:"
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 msgid "Add to trade"
 msgstr "Agredar al intercambio"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: 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 "Añadir al chat"
 
-#: 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 "Cargar atajos antiguos de artículos"
 
-#: src/gui/popupmenu.cpp:1525
+#: src/gui/popupmenu.cpp:1602
 msgid "Load old drop shortcuts"
 msgstr "Cargar atajos antiguos de soltar (drop)"
 
-#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
+#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
 msgid "Show"
 msgstr "Mostrar"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "Por defecto"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Mover para arriba"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Mover para abajo"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Remover nombre"
@@ -1569,60 +1574,60 @@ msgstr "La contraseña debe tener como mínimo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 msgid "Choose Your Server"
 msgstr "Escoja tu servidor"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:235
 msgid "Use same ip for game sub servers"
 msgstr "Usar el mismo ip para los subservidores del juego"
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr "Cargar"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 msgid "Custom Server"
 msgstr "Servidor propio"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique el nombre y el puerto del servidor."
 
-#: src/gui/serverdialog.cpp:513
+#: src/gui/serverdialog.cpp:521
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:526
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
-#: src/gui/serverdialog.cpp:522
+#: src/gui/serverdialog.cpp:530
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
-#: src/gui/serverdialog.cpp:526
+#: src/gui/serverdialog.cpp:534
 msgid "Error retreiving server list!"
 msgstr "Error al recuperar la lista de servers!"
 
-#: src/gui/serverdialog.cpp:624
+#: src/gui/serverdialog.cpp:632
 msgid "requires a newer version"
 msgstr "requiere una version mas nueva"
 
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:634
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -2038,8 +2043,8 @@ msgstr "Fuente de la ayuda"
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: 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 "Reincie el juego para que los cambios tengan efecto."
 
@@ -2190,7 +2195,7 @@ msgid "FPS limit:"
 msgstr "Limite FPS:"
 
 #: 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 "Limites alternativas FPS: "
 
@@ -2219,61 +2224,61 @@ msgid "Font size"
 msgstr "Tamaño de fuente"
 
 #: 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 "Nada"
 
-#: 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 ""
 "Fallo al cambiar para el modo ventana y fallo al restaurar el modo anterior!"
 
-#: 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 ""
 "Fallo al cambiar para el modo ventana completa y fallo al restaurar el modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: src/gui/setup_video.cpp:700
+#: src/gui/setup_video.cpp:703
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
-#: src/gui/setup_video.cpp:701
+#: src/gui/setup_video.cpp:704
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:                "
 
-#: 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 "Resolución de pantalla cambiada"
 
-#: src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:722
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:756
 msgid "Particle Effect Settings Changed."
 msgstr "Configuración del efecto de las partículas cambiado."
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "Los cambios tendran efecto cuando se cambie de mapa."
 
@@ -2418,126 +2423,130 @@ msgid "Atk"
 msgstr "Atacar"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Seleccionar Mundo"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Atacar"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Nombres Ignorados"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Crear clan"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 msgid "Create Party"
 msgstr "Crear grupo"
 
-#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 msgid "Leave"
 msgstr "Dejar"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de   %s."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de  %s."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación a la guild de  %s."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Cancelada la invitación a la guild de %s."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando clan llamado %s."
 
-#: src/gui/socialwindow.cpp:1228
+#: src/gui/socialwindow.cpp:1263
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
-#: src/gui/socialwindow.cpp:1242
+#: src/gui/socialwindow.cpp:1277
 msgid "Guild Name"
 msgstr "Nombre del clan"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 msgid "Choose your guild's name."
 msgstr "Escoja el nombre de su clan."
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del clan, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado al clan %s."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al clan"
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 msgid "You have been invited you to join a party."
 msgstr "Fuiste invitado a un grupo."
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Has sido invitado para unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te ha invitado a unirte a su grupo."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te ha invitado para unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1371
 msgid "Cannot create party. You are already in a party"
 msgstr "No se pudo crear un grupo. Ya estás en uno."
 
-#: src/gui/socialwindow.cpp:1341
+#: src/gui/socialwindow.cpp:1376
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 msgid "Choose your party's name."
 msgstr "Escoja el nombre del grupo."
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr "Especiales"
 
@@ -3365,11 +3374,11 @@ msgstr "Comando: /kick <nick>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Expulsar <nick> del canal."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Se necesita un usuario para ser operador!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Se necesita un usuario a expulsar!"
 
@@ -3469,31 +3478,31 @@ msgstr "INV"
 msgid "SKI"
 msgstr "SKI"
 
-#: src/gui/windowmenu.cpp:84
+#: src/gui/windowmenu.cpp:85
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "SH"
 msgstr "SH"
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: src/gui/windowmenu.cpp:91
+#: src/gui/windowmenu.cpp:93
 msgid "SP"
 msgstr "SP"
 
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:94
 msgid "DR"
 msgstr "DR"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SET"
 msgstr "SET"
 
@@ -3896,68 +3905,68 @@ msgstr ""
 "Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1347
+#: src/localplayer.cpp:1365
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1349
+#: src/localplayer.cpp:1367
 msgid "Item is too far away"
 msgstr "El artículo está muy lejos"
 
-#: src/localplayer.cpp:1351
+#: src/localplayer.cpp:1369
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1353
+#: src/localplayer.cpp:1371
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1356
+#: src/localplayer.cpp:1374
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1359
+#: src/localplayer.cpp:1377
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. 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] "Usted cogió un/a %d [@@%d|%s@@]."
 msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3110
+#: src/localplayer.cpp:3132
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3408
+#: src/localplayer.cpp:3430
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
+#: src/localplayer.cpp:3432 src/localplayer.cpp:3447
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 msgid "Imitation canceled"
 msgstr "Imitar cancelado"
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 msgid "You see "
 msgstr "Ves "
 
@@ -5100,36 +5109,36 @@ msgstr "Eres un ex-jugador."
 msgid "You're pining for the fjords."
 msgstr "Estas avanzando... hacia el barranco."
 
-#: 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 "Mensaje"
 
-#: 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 "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
-#: 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 ""
 "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, c-format
 msgid "You picked up %s."
 msgstr "Has cogido %s."
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, c-format
 msgid "You spent %s."
 msgstr "Has gastado %s."
 
-#: src/net/tmwa/playerhandler.cpp:499
+#: src/net/tmwa/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr "¡Imposible incrementar!"
 
-#: src/net/tmwa/playerhandler.cpp:619
+#: src/net/tmwa/playerhandler.cpp:627
 msgid "Equip arrows first."
 msgstr "Equipar las flechas primero."
 
@@ -5303,3 +5312,11 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Objeto desconocido"
+
+#, fuzzy
+#~ msgid "@@remove attack|Remove from ignore list@@"
+#~ msgstr "@@remove map|Quitar@@"
+
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Seleccionar Mundo"
diff --git a/po/fr.po b/po/fr.po
index 3efbc34e5..d867af996 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\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: 2011-04-16 09:17+0000\n"
 "Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
 "Language-Team: French <>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
@@ -29,87 +29,87 @@ msgstr "esquivé"
 msgid "miss"
 msgstr "raté"
 
-#: 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 "Configuration"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr "Connexion au monde de jeu"
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: 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 "Erreur"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'enregistrement"
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 msgid "Email Change"
 msgstr "Changer d' e-mail"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1143
+#: src/client.cpp:1139
 msgid "Farewell, come back any time..."
 msgstr "Adieu, revenez quand vous voudrez..."
 
-#: 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 "%s n'existe pas et ne peut pas être créé ! Fin du programme."
 
-#: src/client.cpp:1535
+#: src/client.cpp:1531
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Mise à jour incorrecte de l'hôte : %s"
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erreur : %s n'existe pas et ne peut pas être créé ! Déconnection"
@@ -367,7 +367,7 @@ msgid "Buy"
 msgstr "Acheter"
 
 #: 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 "Prix : %s / Total : %s"
@@ -390,7 +390,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 "Quitter"
 
@@ -413,12 +413,12 @@ msgstr "Vendre"
 #: 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"
@@ -518,8 +518,8 @@ msgstr "Coupe de cheveux :"
 msgid "Race:"
 msgstr "Race:"
 
-#: 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 "Créer"
 
@@ -531,20 +531,20 @@ msgstr "Masculin"
 msgid "Female"
 msgstr "Féminin"
 
-#: 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 "Veuillez distribuer %d points"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Votre nom doit comporter un minimum de 4 caractères."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Veuillez retirer %d points"
@@ -574,22 +574,22 @@ msgstr "Se désinscrire"
 msgid "Change Email"
 msgstr "Modifier l'adresse e-mail"
 
-#: 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 "Supprimer"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 msgid "Choose"
 msgstr "Choisir"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, c-format
 msgid "Level %d"
 msgstr "Niveau %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr "(vide)"
 
@@ -802,8 +802,8 @@ msgstr "Équipement"
 
 #: 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 "Retirer"
 
@@ -846,26 +846,26 @@ msgid "id"
 msgstr "id"
 
 #: 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 "Équiper"
 
 #: 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 "Utiliser"
 
 #: 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 "Jeter..."
 
-#: 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 "Partager"
 
@@ -879,18 +879,18 @@ msgid "Weight:"
 msgstr "Poids :"
 
 #: 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 "Entreposer"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: 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 "Jeter"
 
@@ -1069,7 +1069,7 @@ msgstr "Sauter"
 msgid "Login"
 msgstr "Connexion"
 
-#: 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 "Serveur :"
@@ -1323,15 +1323,15 @@ msgstr "@@talk|Parler@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Renvoyer@@"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:262
 #, fuzzy
 msgid "@@remove attack|Remove from attack list@@"
 msgstr "@@remove map|Retirer@@"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:267
 #, fuzzy
-msgid "@@remove attack|Remove from ignore list@@"
-msgstr "@@remove map|Retirer@@"
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|Attaque@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1383,7 +1383,7 @@ msgstr "@@remove map|Retirer@@"
 msgid "@@load old outfits|Load old outfits@@"
 msgstr "@@load old outfits|Charger les anciennes tenues@@"
 
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr "Sortilèges"
 
@@ -1444,84 +1444,89 @@ msgstr "Renommer le panneau de carte"
 msgid "Name:                    "
 msgstr "Nom : "
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 msgid "Add to trade"
 msgstr "Ajouter dans l'échange"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 msgid "Store 10"
 msgstr "Entreposer 10"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 msgid "Store all"
 msgstr "Entreposer tout"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
-#: 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 "Ajouter à la conversation"
 
-#: 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 "Charger les anciens raccourcis d'objets"
 
-#: src/gui/popupmenu.cpp:1525
+#: src/gui/popupmenu.cpp:1602
 msgid "Load old drop shortcuts"
 msgstr "Charger les anciens raccourcis de jets d'objets"
 
-#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
 msgid "Hide"
 msgstr "Cacher"
 
-#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
+#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
 msgid "Show"
 msgstr "Montrer"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "défaut"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Monter"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Descendre"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Enlève le nom"
@@ -1570,60 +1575,60 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents"
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 msgid "Choose Your Server"
 msgstr "Choisissez le serveur"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Port :"
 
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:235
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 msgid "Server type:"
 msgstr "Type de Serveur :"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr "Charger"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Connexion..."
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 msgid "Custom Server"
 msgstr "Serveur personnalisé"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Veuillez entrer l'adresse et le port du serveur."
 
-#: src/gui/serverdialog.cpp:513
+#: src/gui/serverdialog.cpp:521
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:526
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
-#: src/gui/serverdialog.cpp:522
+#: src/gui/serverdialog.cpp:530
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
-#: src/gui/serverdialog.cpp:526
+#: src/gui/serverdialog.cpp:534
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste !"
 
-#: src/gui/serverdialog.cpp:624
+#: src/gui/serverdialog.cpp:632
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:634
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -2039,8 +2044,8 @@ msgstr "Taille de l'aide"
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: 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 "Redémarrez le jeu pour que les changements soient appliqués."
 
@@ -2191,7 +2196,7 @@ msgid "FPS limit:"
 msgstr "Limite FPS :"
 
 #: 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 "Alterner les limites FPS"
 
@@ -2220,66 +2225,66 @@ msgid "Font size"
 msgstr "Taille de police"
 
 #: 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 "Rien"
 
-#: 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 ""
 "Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: 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 ""
 "Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:700
+#: src/gui/setup_video.cpp:703
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution manuelle (Exemple : 1024x768)"
 
-#: src/gui/setup_video.cpp:701
+#: src/gui/setup_video.cpp:704
 msgid "Enter new resolution:                "
 msgstr "Entrer la nouvelle résolution : "
 
-#: 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 "Résolution de l'écran modifiée"
 
-#: src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:722
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
 "réduite."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:756
 msgid "Particle Effect Settings Changed."
 msgstr "Paramètres d'effet de particules modifiés."
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
@@ -2424,128 +2429,132 @@ msgid "Atk"
 msgstr "Attaquer"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Sélection du monde"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Attaquer"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Noms des ignorés"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Créer une Guilde"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 msgid "Create Party"
 msgstr "Créer un groupe"
 
-#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 msgid "Leave"
 msgstr "Quitter"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
-#: src/gui/socialwindow.cpp:1228
+#: src/gui/socialwindow.cpp:1263
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
-#: src/gui/socialwindow.cpp:1242
+#: src/gui/socialwindow.cpp:1277
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 msgid "Choose your guild's name."
 msgstr "Choisissez le nom de la guilde."
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 msgid "Received guild request, but one already exists."
 msgstr ""
 "Reçues un demande pour rejoindre la guilde, mais vous êtes déjà dans une."
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vous a invité à rejoindre la guilde %s."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr ""
 "Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Vous avez été invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vous a invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1371
 msgid "Cannot create party. You are already in a party"
 msgstr "Ne peut pas créer un groupe. Vous faites déjà partie d'un groupe."
 
-#: src/gui/socialwindow.cpp:1341
+#: src/gui/socialwindow.cpp:1376
 msgid "Party Name"
 msgstr "Nom du groupe"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 msgid "Choose your party's name."
 msgstr "Choisissez le nom du groupe."
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr "Cpt. spéciales"
 
@@ -3377,11 +3386,11 @@ msgstr "Commande : /kick <nom du personnage>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Cette commande sort <nom du personnage> du salon."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Indiquez à quel utilisateur donner les droit d'opérateur !"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Indiquez quel utilisateur sortir !"
 
@@ -3481,31 +3490,31 @@ msgstr "INV"
 msgid "SKI"
 msgstr "COM"
 
-#: src/gui/windowmenu.cpp:84
+#: src/gui/windowmenu.cpp:85
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "SH"
 msgstr "RAC"
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: src/gui/windowmenu.cpp:91
+#: src/gui/windowmenu.cpp:93
 msgid "SP"
 msgstr "SOR"
 
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:94
 msgid "DR"
 msgstr "JT"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SET"
 msgstr "CFG"
 
@@ -3908,68 +3917,68 @@ msgstr ""
 "Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
 "des touches ou attendez vous à un possible comportement étrange du jeu."
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr "Vous avez été tué par "
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1347
+#: src/localplayer.cpp:1365
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1349
+#: src/localplayer.cpp:1367
 msgid "Item is too far away"
 msgstr "L'item est trop loin"
 
-#: src/localplayer.cpp:1351
+#: src/localplayer.cpp:1369
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1353
+#: src/localplayer.cpp:1371
 msgid "Stack is too big."
 msgstr "Le regroupement est trop plein"
 
-#: src/localplayer.cpp:1356
+#: src/localplayer.cpp:1374
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1359
+#: src/localplayer.cpp:1377
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. 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] "Vous avez ramassé %d [@@%d|%s@@]."
 msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3110
+#: src/localplayer.cpp:3132
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3408
+#: src/localplayer.cpp:3430
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
+#: src/localplayer.cpp:3432 src/localplayer.cpp:3447
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 msgid "You see "
 msgstr "Vous voyez  "
 
@@ -4676,6 +4685,7 @@ msgid "M.Defense"
 msgstr "Défense M."
 
 #: src/net/tmwa/generalhandler.cpp:259
+#, fuzzy
 msgid "% Accuracy"
 msgstr "% Précision"
 
@@ -5134,39 +5144,39 @@ msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
 msgid "You're pining for the fjords."
 msgstr "Tu reposes au fond de l'eau."
 
-#: 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 "Message"
 
-#: 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 ""
 "Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
 "en mesure de regagner vos points de vie."
 
-#: 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 ""
 "Vous portez moins de la moitié du poids de votre inventaire.Vous pouvez vous "
 "régénérez de nouveau."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, c-format
 msgid "You picked up %s."
 msgstr "Vous avez ramassé  %s."
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, c-format
 msgid "You spent %s."
 msgstr "Vous avez dépensé %s."
 
-#: src/net/tmwa/playerhandler.cpp:499
+#: src/net/tmwa/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr "Ne peut pas augmenter la capacité !"
 
-#: src/net/tmwa/playerhandler.cpp:619
+#: src/net/tmwa/playerhandler.cpp:627
 msgid "Equip arrows first."
 msgstr "Équiper en premier les flèches"
 
@@ -5344,3 +5354,11 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Objet inconnu"
+
+#, fuzzy
+#~ msgid "@@remove attack|Remove from ignore list@@"
+#~ msgstr "@@remove map|Retirer@@"
+
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Sélection du monde"
diff --git a/po/hr.po b/po/hr.po
index 2fc42dbde..10abcf9dd 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-22 00:47+0300\n"
+"POT-Creation-Date: 2011-04-27 22:33+0300\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 #, fuzzy
 msgid "Visible on map"
 msgstr "Vidljiva imena"
@@ -33,96 +33,96 @@ 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 "Podešavanje"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 #, fuzzy
 msgid "Logging in"
 msgstr "Korisničko ime"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Odaberi lika"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: 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 "Greška"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Password Change"
 msgstr "Lozinka"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 #, fuzzy
 msgid "Email Change"
 msgstr "Izmijeni"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Član je uspješno unaprijeđen."
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Odjavi"
 
-#: 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 ""
@@ -398,7 +398,7 @@ msgid "Buy"
 msgstr "Kupi"
 
 #: 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 "Cijena: %s / Ukupno: %s"
@@ -421,7 +421,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 "Izlaz"
 
@@ -444,12 +444,12 @@ msgstr "Prodaj"
 #: 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"
@@ -554,8 +554,8 @@ msgstr "Frizura:"
 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 "Stvori"
 
@@ -567,20 +567,20 @@ msgstr "Muško"
 msgid "Female"
 msgstr "Žensko"
 
-#: 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 "Molimo, rasporedi %d bodova"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ime mora imati barem 4 znaka."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Podaci lika su u redu"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Molimo, oduzmi %d bodova"
@@ -611,23 +611,23 @@ msgstr "Odjavi"
 msgid "Change Email"
 msgstr "Promijeni Email Adresu"
 
-#: 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 "Obriši"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 #, fuzzy
 msgid "Choose"
 msgstr "Zatvori"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, fuzzy, c-format
 msgid "Level %d"
 msgstr "Nivo: %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr ""
 
@@ -860,8 +860,8 @@ msgstr "Oprema"
 
 #: 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 "Skini opremu"
 
@@ -907,27 +907,27 @@ 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 "Opremi"
 
 #: 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 "Upotrijebi"
 
 #: 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
 #, fuzzy
 msgid "Drop..."
 msgstr "Ispusti"
 
-#: 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 "Razdvoji"
 
@@ -941,18 +941,18 @@ msgid "Weight:"
 msgstr "Težina:"
 
 #: 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 "Pohrani"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: 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 "Ispusti"
 
@@ -1139,7 +1139,7 @@ msgstr ""
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: 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 "Poslužitelj:"
@@ -1420,13 +1420,14 @@ msgstr "@@attack|Napadni %s@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Šutni igrača@@"
 
-#: 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@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:267
+#, fuzzy
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|Napadni %s@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1481,7 +1482,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 ""
 
@@ -1549,95 +1550,100 @@ msgstr ""
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 #, fuzzy
 msgid "Store 10"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 #, fuzzy
 msgid "Store half"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 #, fuzzy
 msgid "Store all"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Preuzmi"
 
-#: 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
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "Zadano"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Pomakni Gore"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Pomakni Dolje"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Zapamti korisničko ime"
@@ -1686,65 +1692,65 @@ msgstr "Lozinka mora biti kraća od %d znakova."
 msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Izaberite vaš server"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Port:"
 
-#: 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
 #, fuzzy
 msgid "Server type:"
 msgstr "Poslužitelj:"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 #, fuzzy
 msgid "Connect"
 msgstr "Spajanje..."
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 #, fuzzy
 msgid "Custom Server"
 msgstr "Vlastiti kursor"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
 
-#: 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
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Čekanje servera"
 
-#: 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 ""
@@ -2188,8 +2194,8 @@ msgstr "Pomoć"
 msgid "Theme Changed"
 msgstr "Izmijeni"
 
-#: 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 "Ponovo pokrenite klijent da bi promjene bile efektne."
 
@@ -2350,7 +2356,7 @@ msgid "FPS limit:"
 msgstr "Ograničenje sličica u sekundi"
 
 #: 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
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "Ograničenje sličica u sekundi"
@@ -2381,63 +2387,63 @@ msgid "Font size"
 msgstr "Veličina fonta"
 
 #: 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
 #, fuzzy
 msgid "None"
 msgstr "Ne"
 
-#: 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
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Prebacivanje u pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Promjena OpenGL-a"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: 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
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Rezolucija Ekrana promijenjena"
 
-#: 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
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Postavke efekta čestica su promijenjene."
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "Promjene će stupiti na snagu na promjeni karte."
 
@@ -2584,136 +2590,140 @@ msgid "Atk"
 msgstr "Napad"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Odaberite OK"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Napad"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Ignorirano"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Formiraj Ceh"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 #, fuzzy
 msgid "Create Party"
 msgstr "Stvori Lika"
 
-#: 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
 #, fuzzy
 msgid "Invite"
 msgstr "Pozovi Korisnika"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 #, fuzzy
 msgid "Leave"
 msgstr "Veliko"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Prihvaćen poziv od %s."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odbijen poziv od %s."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Prihvaćen poziv od %s."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odbijen poziv od %s."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Pogreška pri ustanovljavanju ceha."
 
-#: 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
 #, fuzzy
 msgid "Guild Name"
 msgstr "Ceh"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Izaberite vaš server"
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: 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
 #, fuzzy
 msgid "Party Name"
 msgstr "Partija"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Izaberite vaš server"
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr ""
 
@@ -3575,11 +3585,11 @@ msgstr "Naredba: /kick <nadimak>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Ova naredba napravi da <nick> napusti kanal."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Trebate korisnika za op!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Trebate korisnika za kick!"
 
@@ -3683,32 +3693,32 @@ 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
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Kratica"
 
-#: 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 ""
 
@@ -4136,73 +4146,73 @@ 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
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Neuspješno korištenje predmeta."
 
-#: 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
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Server je pun"
 
-#: 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
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Pokupili ste %s [@@%d|%s@@]."
 msgstr[1] "Pokupili ste %s [@@%d|%s@@]."
 
-#: 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
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Otkazano trgovanje."
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 #, fuzzy
 msgid "Imitation: "
 msgstr "Promijeni Email Adresu"
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Otkazano trgovanje."
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 #, fuzzy
 msgid "You see "
 msgstr "Vi dobijete %s."
@@ -5419,40 +5429,40 @@ msgstr "Vi ste bivši igrač."
 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 "Poruka"
 
-#: 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 ""
 "Nosite više od pola svoje težine. Niste u mogućnosti kako bi povratili "
 "zdravlje."
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Nosite više od pola svoje težine. Niste u mogućnosti kako bi povratili "
 "zdravlje."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Pokupili ste "
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Vi dobijete %s."
 
-#: 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 "Prvo se opremite strijelama."
 
@@ -5630,6 +5640,10 @@ msgstr "Mana %+d"
 msgid "Unknown item"
 msgstr "Nepoznati predmet"
 
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Odaberite OK"
+
 #~ msgid "-- Help --"
 #~ msgstr "-- Pomoć --"
 
diff --git a/po/hu.po b/po/hu.po
index 6175e0f6e..85458e9a7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-22 00:47+0300\n"
+"POT-Creation-Date: 2011-04-27 22:33+0300\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 #, fuzzy
 msgid "Visible on map"
 msgstr "Látható nevek"
@@ -32,96 +32,96 @@ 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 "Beállítások"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 #, fuzzy
 msgid "Logging in"
 msgstr "Belépés"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Szerver"
 
-#: 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 "Hiba"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Password Change"
 msgstr "Jelszó:"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 #, fuzzy
 msgid "Email Change"
 msgstr "Változtatás"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "A tag előléptetése sikeres."
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Regisztráció megszüntetése"
 
-#: 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
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Helytelen frissítési kiszolgáló: "
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -393,7 +393,7 @@ msgid "Buy"
 msgstr "Vétel"
 
 #: 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 "Ár: %s / Teljes: %s"
@@ -416,7 +416,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 "Kilépés"
 
@@ -439,12 +439,12 @@ msgstr "Eladás"
 #: 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"
@@ -549,8 +549,8 @@ msgstr "Haj stílus:"
 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 "Létrehozás"
 
@@ -562,20 +562,20 @@ msgstr "Férfi"
 msgid "Female"
 msgstr "Nő"
 
-#: 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 "Kérlek oszd el a pontjaidat (%d van még)"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "A nevednek minimum 4 karakternek kell lennie."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Karakter statok rendben"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Kérlek távolíts el %d pontot"
@@ -606,23 +606,23 @@ msgstr "Regisztráció megszüntetése"
 msgid "Change Email"
 msgstr "Email cím módosírása"
 
-#: 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 "Törlés"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 #, fuzzy
 msgid "Choose"
 msgstr "Bezár"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, fuzzy, c-format
 msgid "Level %d"
 msgstr "Szint: %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr ""
 
@@ -856,8 +856,8 @@ msgstr "Felszerelés"
 
 #: 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 "Nem használ"
 
@@ -903,27 +903,27 @@ 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 "Használ"
 
 #: 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 "Bevet"
 
 #: 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
 #, fuzzy
 msgid "Drop..."
 msgstr "Eldob"
 
-#: 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 "Felosztás"
 
@@ -937,18 +937,18 @@ msgid "Weight:"
 msgstr "Súly:"
 
 #: 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 "Raktároz"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: 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 "Eldob"
 
@@ -1135,7 +1135,7 @@ msgstr ""
 msgid "Login"
 msgstr "Belépés"
 
-#: 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 "Szerver:"
@@ -1416,13 +1416,14 @@ msgstr "@@attack|%s megtámadása@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Játékos kirúgása@@"
 
-#: 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@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:267
+#, fuzzy
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|%s megtámadása@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1477,7 +1478,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 ""
 
@@ -1545,95 +1546,100 @@ msgstr ""
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 #, fuzzy
 msgid "Store 10"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 #, fuzzy
 msgid "Store half"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 #, fuzzy
 msgid "Store all"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Magához vesz"
 
-#: 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
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "Alapértelmezett"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Mozgás felfelé"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Mozgás lefelé"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Felhasználónév megjegyzése"
@@ -1682,65 +1688,65 @@ msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Válassz szervert"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Port:"
 
-#: 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
 #, fuzzy
 msgid "Server type:"
 msgstr "Szerver:"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 #, fuzzy
 msgid "Connect"
 msgstr "Csatlakozás…"
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 #, fuzzy
 msgid "Custom Server"
 msgstr "Egyéni kurzor"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Kérlek írd be a szerver címét és portját egyaránt."
 
-#: 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
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Várakozás a szerverre"
 
-#: 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 ""
@@ -2184,8 +2190,8 @@ msgstr "Súgó"
 msgid "Theme Changed"
 msgstr "Változtatás"
 
-#: 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 "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
@@ -2346,7 +2352,7 @@ msgid "FPS limit:"
 msgstr "FPS Limit:"
 
 #: 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
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS Limit:"
@@ -2377,65 +2383,65 @@ msgid "Font size"
 msgstr "Betűméret"
 
 #: 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
 #, fuzzy
 msgid "None"
 msgstr "Nem"
 
-#: src/gui/setup_video.cpp:531
+#: src/gui/setup_video.cpp:533
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
 
-#: src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:539
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Átállás teljes képernyőre"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "OpenGL átállítása"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: 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
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "A képernyő felbontása megváltozott"
 
-#: 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
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Effektek beállítása megváltozott."
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "A változások érvénybe lépéséhez töltsön be egy új térképet."
 
@@ -2582,136 +2588,140 @@ msgid "Atk"
 msgstr "Támadás"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Ok Kiválasztása"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Támadás"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Tiltott"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Klán létrehozása"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 #, fuzzy
 msgid "Create Party"
 msgstr "Karakter létrehozása"
 
-#: 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
 #, fuzzy
 msgid "Invite"
 msgstr "Felhasználó meghívása"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 #, fuzzy
 msgid "Leave"
 msgstr "Nagy"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Csapatba hívást elfogadta %s."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Csapatba hívást elutasította %s."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Csapatba hívást elfogadta %s."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Csapatba hívást elutasította %s."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Hiba a klán létrehozása közben."
 
-#: 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
 #, fuzzy
 msgid "Guild Name"
 msgstr "Klán"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Válassz szervert"
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s a csapatába hívott."
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s a csapatába hívott."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Ajánlat elfogadása"
 
-#: 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
 #, fuzzy
 msgid "Party Name"
 msgstr "Csapat"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Válassz szervert"
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr ""
 
@@ -3575,11 +3585,11 @@ msgstr "Parancs: /kick <név>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Ez a parancs kirúgja a <név> alatt megadott személyt a csatornából."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Kell egy játékos az op parancshoz."
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Kell egy játékos a kick parancshoz."
 
@@ -3685,32 +3695,32 @@ 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
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Gyorsmenü"
 
-#: 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 ""
 
@@ -4138,74 +4148,74 @@ msgid ""
 "strange behaviour."
 msgstr "Állítsd át, vagy a játék érdekesen fog viselkedni."
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Nem tudod felvenni a tárgyat."
 
-#: 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
 #, fuzzy
 msgid "Inventory is full."
 msgstr "A szerver tele van"
 
-#: 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
 #, fuzzy
 msgid "Unknown problem picking up item."
 msgstr "Nem tudod felvenni a tárgyat."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1384
+#: src/localplayer.cpp:1402
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Zsákmányod%s [@@%d|%s@@]."
 msgstr[1] "Zsákmányod%s [@@%d|%s@@]."
 
-#: 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
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Az üzlet megszakadt."
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 #, fuzzy
 msgid "Imitation: "
 msgstr "Email cím módosírása"
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Az üzlet megszakadt."
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 #, fuzzy
 msgid "You see "
 msgstr "Kapott tárgy: %s."
@@ -5437,36 +5447,36 @@ msgstr "Ex-játékos lettél."
 msgid "You're pining for the fjords."
 msgstr "Az örök búzamezőkön kaszálgatsz."
 
-#: 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 "Üzenet"
 
-#: 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 "Több tárgy van nálad mint a súlyod fele. Nem töltődik az életed."
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr "Több tárgy van nálad mint a súlyod fele. Nem töltődik az életed."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Zsákmányod "
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Kapott tárgy: %s."
 
-#: 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 "Előbb tegyél be nyílvesszőt."
 
@@ -5645,6 +5655,10 @@ msgstr "Varázserő %+d"
 msgid "Unknown item"
 msgstr "Ismeretlen tárgy"
 
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Ok Kiválasztása"
+
 #~ msgid "-- Help --"
 #~ msgstr "-- Segítség --"
 
diff --git a/po/it.po b/po/it.po
index 19d6b8d1b..b8b8c46ef 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\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: 2011-04-15 17:33+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Italian <>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 msgid "Visible on map"
 msgstr ""
 
@@ -29,87 +29,87 @@ msgstr "Schivato"
 msgid "miss"
 msgstr "Mancato"
 
-#: 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 "Impostazioni"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 msgid "Logging in"
 msgstr "Accesso"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 msgid "Requesting characters"
 msgstr "Ricerca personaggi"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
-#: 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 "Errore"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 msgid "Password Change"
 msgstr "Cambiamento password"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 msgid "Email Change"
 msgstr "Cambio Email"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
-#: src/client.cpp:1143
+#: src/client.cpp:1139
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
-#: 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 "%s non esiste e non può essere creato! Uscita in corso."
 
-#: src/client.cpp:1535
+#: src/client.cpp:1531
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
@@ -366,7 +366,7 @@ msgid "Buy"
 msgstr "Compra"
 
 #: 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 "Prezzo: %s / Totale: %s"
@@ -389,7 +389,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 "Esci"
 
@@ -412,12 +412,12 @@ msgstr "Vendi"
 #: 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"
@@ -517,8 +517,8 @@ msgstr "Taglio di capelli:"
 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 "Crea"
 
@@ -530,20 +530,20 @@ msgstr "Maschio"
 msgid "Female"
 msgstr "Femmina"
 
-#: 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 "Distribuire %d punti"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
@@ -573,22 +573,22 @@ msgstr "Cancella registrazione"
 msgid "Change Email"
 msgstr "Cambia email"
 
-#: 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 "Elimina"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 msgid "Choose"
 msgstr "Scegli"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, c-format
 msgid "Level %d"
 msgstr "Livello %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr "(vuoto)"
 
@@ -801,8 +801,8 @@ msgstr "Equipaggiamento"
 
 #: 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 "Togli"
 
@@ -845,26 +845,26 @@ msgid "id"
 msgstr "id"
 
 #: 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 "Equipaggia"
 
 #: 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 "Usa"
 
 #: 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 "Lascia..."
 
-#: 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 "Dividi"
 
@@ -878,18 +878,18 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: 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 "Magazzino"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: 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 "Lascia"
 
@@ -1068,7 +1068,7 @@ msgstr "Salta"
 msgid "Login"
 msgstr "Autenticazione"
 
-#: 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 "Server:"
@@ -1322,13 +1322,14 @@ msgstr "@@talk|Parla@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Escludi@@"
 
-#: 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@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:267
+#, fuzzy
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|Attacco@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1380,7 +1381,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 ""
 
@@ -1441,84 +1442,89 @@ 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
 #, fuzzy
 msgid "(default)"
 msgstr "Predefinito"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Muoviti verso l'alto"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Muoviti verso il basso"
 
-#: 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 ""
 
@@ -1566,60 +1572,60 @@ msgstr "La password deve contenere meno di %d caratteri."
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: 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 "Porta:"
 
-#: 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 "Per favore inserisci l'indirizzo e la porta del server."
 
-#: 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 ""
@@ -2032,8 +2038,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 "Per applicare le modifiche, è necessario riavviare il client."
 
@@ -2184,7 +2190,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 ""
 
@@ -2213,58 +2219,58 @@ msgid "Font size"
 msgstr "Dimensione caratteri"
 
 #: 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 "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: 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 "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: 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 "I cambi saranno effettuati al cambio della mappa."
 
@@ -2409,126 +2415,130 @@ msgid "Atk"
 msgstr "Attacco"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Seleziona OK"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Attacco"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Ignora"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Crea una Gilda"
 
-#: 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 "Ricevuta richiesta di party, ma ne esiste già una."
 
-#: 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 "%s ti ha invitato ad unirti al suo party."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: 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 ""
 
@@ -3356,11 +3366,11 @@ msgstr "Comando: /kick <nick>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Questo comando fa uscire <nick> dal canale."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Specificare un utente da rendere operatore!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Si deve specificare un utente da rimuovere!"
 
@@ -3458,31 +3468,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 ""
 
@@ -3883,68 +3893,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 ""
 
@@ -5082,37 +5092,37 @@ msgstr "Sei un ex-giocatore."
 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 "Messaggio"
 
-#: 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 ""
 "Stai trasportando più della metà del tuo peso. Non puoi recuperare le "
 "energie."
 
-#: 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 "Equipaggia prima le frecce"
 
@@ -5286,3 +5296,7 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
+
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Seleziona OK"
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 ""
 
diff --git a/po/nl.po b/po/nl.po
index 528e6e857..e9f4dabc1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-22 00:47+0300\n"
+"POT-Creation-Date: 2011-04-27 22:33+0300\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 #, fuzzy
 msgid "Visible on map"
 msgstr "Zichtbare namen"
@@ -32,96 +32,96 @@ 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 "Configureren"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Verbinden met de map server..."
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 #, fuzzy
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Kies Personage"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Verbinden met de map server..."
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: 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 "Fout"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Password Change"
 msgstr "Wachtwoord:"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 #, fuzzy
 msgid "Email Change"
 msgstr "Veranderen"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Lid is succesvol gepromoveerd."
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Registreren"
 
-#: 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
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige updatahost: "
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -392,7 +392,7 @@ msgid "Buy"
 msgstr "Kopen"
 
 #: 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 "Prijs: %s / Totaal: %s"
@@ -415,7 +415,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 "Afsluiten"
 
@@ -438,12 +438,12 @@ msgstr "Verkopen"
 #: 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"
@@ -548,8 +548,8 @@ msgstr "Haarstijl:"
 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 "Aanmaken"
 
@@ -561,20 +561,20 @@ msgstr "Mannelijk"
 msgid "Female"
 msgstr "Vrouwelijk"
 
-#: 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 "Nog %d punten te verdelen"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -605,23 +605,23 @@ msgstr "Registreren"
 msgid "Change Email"
 msgstr "Emailadres wijzigen"
 
-#: 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 "Verwijderen"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 #, fuzzy
 msgid "Choose"
 msgstr "Sluiten"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, fuzzy, c-format
 msgid "Level %d"
 msgstr "Level: %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr ""
 
@@ -855,8 +855,8 @@ msgstr "Uitrusting"
 
 #: 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 "Afdoen"
 
@@ -902,27 +902,27 @@ 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 "Uitrusten"
 
 #: 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 "Gebruiken"
 
 #: 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
 #, fuzzy
 msgid "Drop..."
 msgstr "Neerleggen"
 
-#: 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 "Splitsen"
 
@@ -936,18 +936,18 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: 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 "Opslaan"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: 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 "Neerleggen"
 
@@ -1134,7 +1134,7 @@ msgstr ""
 msgid "Login"
 msgstr "Inloggen"
 
-#: 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 "Server:"
@@ -1407,13 +1407,14 @@ msgstr "@@attack|%s aanvallen@@"
 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@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:267
+#, fuzzy
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|%s aanvallen@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1466,7 +1467,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 ""
 
@@ -1534,94 +1535,99 @@ msgstr ""
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 #, fuzzy
 msgid "Add to trade"
 msgstr "Handel goedkeuren"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 #, fuzzy
 msgid "Store 10"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 #, fuzzy
 msgid "Store half"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 #, fuzzy
 msgid "Store all"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Afhalen"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "Standaard"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Omhoog"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Omlaag"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Onthoud Naam"
@@ -1670,65 +1676,65 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Kies jouw server"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Poort:"
 
-#: 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
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 #, fuzzy
 msgid "Connect"
 msgstr "Verbinden..."
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 #, fuzzy
 msgid "Custom Server"
 msgstr "Aangepaste cursor"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Typ aub zowel het adres van de server, als de poort."
 
-#: 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
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Wachten op server"
 
-#: 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 ""
@@ -2172,8 +2178,8 @@ msgstr "Help"
 msgid "Theme Changed"
 msgstr "Veranderen"
 
-#: 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 "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -2334,7 +2340,7 @@ msgid "FPS limit:"
 msgstr "FPS limiet:"
 
 #: 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
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS limiet:"
@@ -2365,65 +2371,65 @@ msgid "Font size"
 msgstr "Lettergrootte"
 
 #: 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
 #, fuzzy
 msgid "None"
 msgstr "Nee"
 
-#: src/gui/setup_video.cpp:531
+#: src/gui/setup_video.cpp:533
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "modus en herstel van oude modus ook gefaald!"
 
-#: src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:539
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "modus en herstel van oude modus ook gefaald!"
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Overgaan naar volledig scherm"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Veranderen van OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: 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
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Schermresolutie veranderd"
 
-#: 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
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Deeltjes effecten instellingen gewijzigd."
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "Wijzigingen treden in werking bij het wisselen van map."
 
@@ -2570,136 +2576,140 @@ msgid "Atk"
 msgstr "Aanvallen"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "OK selecteren"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Aanvallen"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Genegeerd"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 #, fuzzy
 msgid "Create Party"
 msgstr "Personage Aanmaken"
 
-#: 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
 #, fuzzy
 msgid "Invite"
 msgstr "Gebruiker uitnodigen"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 #, fuzzy
 msgid "Leave"
 msgstr "Groot"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging van %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging van %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging van %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging van %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Fout bij het creëren van guild."
 
-#: 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
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Kies jouw server"
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: 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
 #, fuzzy
 msgid "Party Name"
 msgstr "Groep"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Kies jouw server"
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr ""
 
@@ -3567,11 +3577,11 @@ msgstr "Commando: /kick <nick>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Dit commando maakt <nick> het kanaal verlaten."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Een gebruiker nodig om kanaalbeheerder te maken!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Een gebruiker nodig om uit het kanaal te verwijderen!"
 
@@ -3676,32 +3686,32 @@ 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
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Sneltoets"
 
-#: 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 ""
 
@@ -4129,74 +4139,74 @@ msgid ""
 "strange behaviour."
 msgstr "Los deze problemen op, of het spel kan raar gedrag vertonen."
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Kan het voorwerp niet oprapen."
 
-#: 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
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Server is volzet"
 
-#: 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
 #, fuzzy
 msgid "Unknown problem picking up item."
 msgstr "Kan het voorwerp niet oprapen."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1384
+#: src/localplayer.cpp:1402
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Je raapte %s [@@%d|%s@@] op."
 msgstr[1] "Je raapte %s [@@%d|%s@@] op."
 
-#: 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
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Handel geannuleerd."
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 #, fuzzy
 msgid "Imitation: "
 msgstr "Emailadres wijzigen"
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Handel geannuleerd."
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 #, fuzzy
 msgid "You see "
 msgstr "Jij krijgt %s."
@@ -5433,40 +5443,40 @@ msgstr "Je bent een ex-speler."
 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 "Bericht"
 
-#: 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 ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Je raapte op: "
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Jij krijgt %s."
 
-#: 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 ""
 
@@ -5646,6 +5656,10 @@ msgstr "Magie %+d"
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "OK selecteren"
+
 #~ msgid "-- Help --"
 #~ msgstr "-- Help --"
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 83f654890..354f5ea95 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: manaplus\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: 2011-03-29 18:51+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) <>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 #, fuzzy
 msgid "Visible on map"
 msgstr "Zichtbare namen"
@@ -30,87 +30,87 @@ msgstr "ontwijkt"
 msgid "miss"
 msgstr "mist"
 
-#: 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 "Configureren"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: 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 "Fout"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1143
+#: src/client.cpp:1139
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: 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 "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/client.cpp:1535
+#: src/client.cpp:1531
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -367,7 +367,7 @@ msgid "Buy"
 msgstr "Kopen"
 
 #: 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 "Prijs: %s / Totaal: %s"
@@ -390,7 +390,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 "Afsluiten"
 
@@ -413,12 +413,12 @@ msgstr "Verkopen"
 #: 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"
@@ -518,8 +518,8 @@ msgstr "Haarstijl:"
 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 "Aanmaken"
 
@@ -531,20 +531,20 @@ msgstr "Mannelijk"
 msgid "Female"
 msgstr "Vrouwelijk"
 
-#: 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 "Nog %d punten te verdelen"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -574,22 +574,22 @@ msgstr "Registreren"
 msgid "Change Email"
 msgstr "Wijzig Email"
 
-#: 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 "Verwijderen"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 msgid "Choose"
 msgstr "Kies"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, c-format
 msgid "Level %d"
 msgstr "Niveau %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr ""
 
@@ -802,8 +802,8 @@ msgstr "Uitrusting"
 
 #: 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 "Afdoen"
 
@@ -846,26 +846,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 "Uitrusten"
 
 #: 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 "Gebruiken"
 
 #: 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 "Splitsen"
 
@@ -879,18 +879,18 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: 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 "Opslaan"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: 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 "Neerleggen"
 
@@ -1069,7 +1069,7 @@ msgstr "Overslaan"
 msgid "Login"
 msgstr "Inloggen"
 
-#: 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 "Server:"
@@ -1323,12 +1323,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
@@ -1380,7 +1380,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 ""
 
@@ -1441,84 +1441,89 @@ 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
 #, fuzzy
 msgid "(default)"
 msgstr "standaard"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Omhoog"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Omlaag"
 
-#: 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 ""
 
@@ -1566,60 +1571,60 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: 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 "Poort:"
 
-#: 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 "Typ aub zowel het adres van de server, als de poort."
 
-#: 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 "Download voorbereiden"
 
-#: src/gui/serverdialog.cpp:526
+#: src/gui/serverdialog.cpp:534
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
-#: 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 ""
@@ -2034,8 +2039,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 "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -2186,7 +2191,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 ""
 
@@ -2215,60 +2220,60 @@ msgid "Font size"
 msgstr "Lettergrootte"
 
 #: 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 "Geen"
 
-#: 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 "Verwisselen naar Volledig Scherm"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: 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 ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
 "resolutie"
 
-#: 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 "Wijzigingen treden in werking bij het wisselen van map."
 
@@ -2413,126 +2418,130 @@ msgid "Atk"
 msgstr "Aanvallen"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "OK selecteren"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Aanvallen"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Negeer"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: 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 "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: 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 "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: 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 ""
 
@@ -3364,11 +3373,11 @@ msgstr "Commando: /kick <nick>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Dit commando maakt <nick> het kanaal verlaten."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Een gebruiker nodig om kanaalbeheerder te maken!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Een gebruiker nodig om uit het kanaal te verwijderen!"
 
@@ -3466,31 +3475,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 ""
 
@@ -3891,70 +3900,70 @@ 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
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Handel geannuleerd."
 
-#: 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
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Handel geannuleerd."
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 msgid "You see "
 msgstr ""
 
@@ -5096,37 +5105,37 @@ msgstr "Je bent een ex-speler."
 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 "Bericht"
 
-#: 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 ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
 
-#: 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 ""
 
@@ -5301,6 +5310,10 @@ msgstr "Magie %+d"
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "OK selecteren"
+
 #~ msgid "-- Help --"
 #~ msgstr "-- Help --"
 
diff --git a/po/pl.po b/po/pl.po
index 661e18d97..3ea0a5f74 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-22 00:47+0300\n"
+"POT-Creation-Date: 2011-04-27 22:33+0300\n"
 "PO-Revision-Date: 2009-09-14 06:59+0000\n"
 "Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 #, fuzzy
 msgid "Visible on map"
 msgstr "Widoczne imiona"
@@ -35,96 +35,96 @@ 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 "Konfiguracja"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem map..."
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 #, fuzzy
 msgid "Logging in"
 msgstr "Użytkownik"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Wybierz postać"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Łączenie z serwerem map..."
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Serwer"
 
-#: 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 "Błąd"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Password Change"
 msgstr "Hasło:"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 #, fuzzy
 msgid "Email Change"
 msgstr "Zmień"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Członek został pomyślnie wypromowany."
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Wyrejestruj"
 
-#: 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
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy host aktualizacji: "
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -400,7 +400,7 @@ msgid "Buy"
 msgstr "Kup"
 
 #: 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 "Cena: %s/ Razem: %s"
@@ -423,7 +423,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 "Wyjdź"
 
@@ -446,12 +446,12 @@ msgstr "Sprzedaj"
 #: 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"
@@ -556,8 +556,8 @@ msgstr "Fryzura:"
 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 "Utwórz"
 
@@ -569,20 +569,20 @@ msgstr "Mężczyzna"
 msgid "Female"
 msgstr "Kobieta"
 
-#: 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 "Proszę wykorzystać %d punktów"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć conajmniej 4 znaki."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
@@ -613,23 +613,23 @@ msgstr "Wyrejestruj"
 msgid "Change Email"
 msgstr "Zmień adres Email"
 
-#: 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 "Usuń"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 #, fuzzy
 msgid "Choose"
 msgstr "Zamknij"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, fuzzy, c-format
 msgid "Level %d"
 msgstr "Poziom: %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr ""
 
@@ -863,8 +863,8 @@ msgstr "Ekwipunek"
 
 #: 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 "Zdejmij"
 
@@ -909,27 +909,27 @@ 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 "Załóż"
 
 #: 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 "Użyj"
 
 #: 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
 #, fuzzy
 msgid "Drop..."
 msgstr "Upuść"
 
-#: 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 "Podziel"
 
@@ -943,18 +943,18 @@ msgid "Weight:"
 msgstr "Waga:"
 
 #: 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 "Przechowaj"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: 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 "Upuść"
 
@@ -1141,7 +1141,7 @@ msgstr ""
 msgid "Login"
 msgstr "Użytkownik"
 
-#: 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 "Serwer:"
@@ -1421,13 +1421,14 @@ msgstr "@@attack|Atakuj %s@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Wykop gracza@@"
 
-#: 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@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:267
+#, fuzzy
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|Atakuj %s@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1482,7 +1483,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 ""
 
@@ -1550,95 +1551,100 @@ msgstr ""
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 #, fuzzy
 msgid "Store 10"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 #, fuzzy
 msgid "Store half"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 #, fuzzy
 msgid "Store all"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Pobierz"
 
-#: 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
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "Domyślny"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Przesuń w górę"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Przesuń w dół"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Zapamiętaj użytkownika"
@@ -1687,65 +1693,65 @@ msgstr "Hasło nie może mieć więcej jak %d znaków."
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Wybierz twój serwer"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Port:"
 
-#: 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
 #, fuzzy
 msgid "Server type:"
 msgstr "Serwer:"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 #, fuzzy
 msgid "Connect"
 msgstr "Łączenie..."
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 #, fuzzy
 msgid "Custom Server"
 msgstr "Własny kursor"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Proszę wpisać adres i port serwera"
 
-#: 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
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Oczekiwanie na serwer"
 
-#: 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 ""
@@ -2189,8 +2195,8 @@ msgstr "Pomoc"
 msgid "Theme Changed"
 msgstr "Zmień"
 
-#: 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 "Uruchom ponownie twojego klienta, aby mogły zajść zmiany."
 
@@ -2351,7 +2357,7 @@ msgid "FPS limit:"
 msgstr "Limit FPS:"
 
 #: 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
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "Limit FPS:"
@@ -2382,65 +2388,65 @@ msgid "Font size"
 msgstr "Rozmiar czcionki"
 
 #: 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
 #, fuzzy
 msgid "None"
 msgstr "Nie"
 
-#: src/gui/setup_video.cpp:531
+#: src/gui/setup_video.cpp:533
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
 
-#: src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:539
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Przełączanie na pełen ekran"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Zmień na OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
-#: 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
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Zmieniono rozdzielczość ekranu"
 
-#: 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
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Zmieniono ustawienia ef. cząsteczek"
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "Efekty nastąpią po zmianie mapy."
 
@@ -2587,136 +2593,140 @@ msgid "Atk"
 msgstr "Atak"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Wybrano OK"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Atak"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Ignorowany"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Utwórz Gildię"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 #, fuzzy
 msgid "Create Party"
 msgstr "Stwórz postać"
 
-#: 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
 #, fuzzy
 msgid "Invite"
 msgstr "Zaproś Użytkownika"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 #, fuzzy
 msgid "Leave"
 msgstr "Duża"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Zaakceptowano zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Błąd podczas tworzenia gildii."
 
-#: 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
 #, fuzzy
 msgid "Guild Name"
 msgstr "Gildia"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Wybierz twój serwer"
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy."
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: 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
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupa"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Wybierz twój serwer"
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr ""
 
@@ -3580,11 +3590,11 @@ msgstr "Komenda: /kick <ksywka>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Komenda spowoduje, iż <ksywka> opuści kanał."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Wymagany użytkownik, aby przydzielić opa!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Wymagany użytkownk, aby go wykopać!"
 
@@ -3689,32 +3699,32 @@ 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
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Skrót"
 
-#: 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 ""
 
@@ -4142,74 +4152,74 @@ msgid ""
 "strange behaviour."
 msgstr "Rozwiąż je, albo granie może być utrudnione."
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Nie można podnieść przedmiotu."
 
-#: 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
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Serwer jest pełny"
 
-#: 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
 #, fuzzy
 msgid "Unknown problem picking up item."
 msgstr "Nie można podnieść przedmiotu."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1384
+#: src/localplayer.cpp:1402
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Podniosłeś %s [@@%d|%s@@]."
 msgstr[1] "Podniosłeś %s [@@%d|%s@@]."
 
-#: 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
 #, fuzzy
 msgid "Follow canceled"
 msgstr " anulował"
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 #, fuzzy
 msgid "Imitation: "
 msgstr "Zmień adres Email"
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 #, fuzzy
 msgid "Imitation canceled"
 msgstr " anulował"
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 #, fuzzy
 msgid "You see "
 msgstr "Otrzymujesz %s"
@@ -5440,36 +5450,36 @@ msgstr "Jesteś ex-graczem."
 msgid "You're pining for the fjords."
 msgstr "Usychasz z tęsknoty za fiordami."
 
-#: 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 "Wiadomość"
 
-#: 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 "Nosisz więcej, niż połowa twojej wagi. Nie możesz odzyskiwać zdrowia."
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr "Nosisz więcej, niż połowa twojej wagi. Nie możesz odzyskiwać zdrowia."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Podniosłeś "
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Otrzymujesz %s"
 
-#: 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 "Najpierw załóż strzały."
 
@@ -5650,6 +5660,10 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Wybrano OK"
+
 #~ msgid "-- Help --"
 #~ msgstr "-- Pomoc --"
 
diff --git a/po/pt.po b/po/pt.po
index a022499ec..7df89ecdc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\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: 2011-04-15 17:33+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese <>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
@@ -29,87 +29,87 @@ msgstr "desviou"
 msgid "miss"
 msgstr "errou"
 
-#: 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 "Configurar"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: 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 "Erro"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1143
+#: src/client.cpp:1139
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: 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 "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1535
+#: src/client.cpp:1531
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -365,7 +365,7 @@ msgid "Buy"
 msgstr "Comprar"
 
 #: 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 "Preço: %s / Total: %s"
@@ -388,7 +388,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 "Sair"
 
@@ -411,12 +411,12 @@ msgstr "Vender"
 #: 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"
@@ -516,8 +516,8 @@ msgstr "Estilo do Cabelo:"
 msgid "Race:"
 msgstr "Corrida:"
 
-#: 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 "Criar"
 
@@ -529,20 +529,20 @@ msgstr "Homem"
 msgid "Female"
 msgstr "Mulher"
 
-#: 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 "Por favor distribua %d pontos"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -572,22 +572,22 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Alterar email"
 
-#: 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 "Excluir"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 msgid "Choose"
 msgstr "Escolher"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, c-format
 msgid "Level %d"
 msgstr "Nível %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr "(vazio)"
 
@@ -800,8 +800,8 @@ msgstr "Equipamento"
 
 #: 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 "Desequipar"
 
@@ -844,26 +844,26 @@ msgid "id"
 msgstr "id"
 
 #: 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 "Equipar"
 
 #: 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 "Usar"
 
 #: 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 "Descartar..."
 
-#: 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 "Dividir"
 
@@ -877,18 +877,18 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: 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 "Armazenar"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: 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 "Descartar"
 
@@ -1067,7 +1067,7 @@ msgstr "Passar"
 msgid "Login"
 msgstr "Login"
 
-#: 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 "Servidor:"
@@ -1321,15 +1321,15 @@ msgstr "@@talk|Conversar@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Expulsar@@"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:262
 #, fuzzy
 msgid "@@remove attack|Remove from attack list@@"
 msgstr "@@remove map|Remover do mapa@@"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:267
 #, fuzzy
-msgid "@@remove attack|Remove from ignore list@@"
-msgstr "@@remove map|Remover do mapa@@"
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|Atacar@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1381,7 +1381,7 @@ msgstr "@@remove map|Remover do mapa@@"
 msgid "@@load old outfits|Load old outfits@@"
 msgstr "@@load old outfits|Carregar antigos roupas@@"
 
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr "Feitiços"
 
@@ -1442,84 +1442,89 @@ msgstr "Renomear mapa          "
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: 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 "Nome no chat"
 
-#: 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 "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1525
+#: src/gui/popupmenu.cpp:1602
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
+#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
 msgid "Show"
 msgstr "Mostrar"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "padrão"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Mover para Cima"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Mover para Baixo"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Remover nome"
@@ -1568,60 +1573,60 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:235
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 msgid "Custom Server"
 msgstr "Servidor customizado"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:513
+#: src/gui/serverdialog.cpp:521
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:526
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:522
+#: src/gui/serverdialog.cpp:530
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:526
+#: src/gui/serverdialog.cpp:534
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:624
+#: src/gui/serverdialog.cpp:632
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:634
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -2036,8 +2041,8 @@ msgstr "Fonte de ajuda"
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: 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 "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2188,7 +2193,7 @@ msgid "FPS limit:"
 msgstr "Limite FPS:"
 
 #: 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 "Limite FPS alt: "
 
@@ -2217,62 +2222,62 @@ msgid "Font size"
 msgstr "Tamanho da fonte"
 
 #: 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 "Nenhum"
 
-#: 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 ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: 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 ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:700
+#: src/gui/setup_video.cpp:703
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:701
+#: src/gui/setup_video.cpp:704
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: 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 "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:722
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:756
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -2417,126 +2422,130 @@ msgid "Atk"
 msgstr "Atacar"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Selecionar Mundo"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Atacar"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Nome de Ignorados"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017
 msgid "Invite"
 msgstr "Convidar"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1228
+#: src/gui/socialwindow.cpp:1263
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1242
+#: src/gui/socialwindow.cpp:1277
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1371
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
-#: src/gui/socialwindow.cpp:1341
+#: src/gui/socialwindow.cpp:1376
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr "Especiais"
 
@@ -3362,11 +3371,11 @@ msgstr "Comando: /kick <nick>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Retirar <nick> do canal."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "É preciso um usuário para dar op!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "É preciso um usuário para expulsar!"
 
@@ -3465,31 +3474,31 @@ msgstr "INV"
 msgid "SKI"
 msgstr "HAB"
 
-#: src/gui/windowmenu.cpp:84
+#: src/gui/windowmenu.cpp:85
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "SH"
 msgstr "AT"
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: src/gui/windowmenu.cpp:91
+#: src/gui/windowmenu.cpp:93
 msgid "SP"
 msgstr "FE"
 
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:94
 msgid "DR"
 msgstr "DE"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SET"
 msgstr "CON"
 
@@ -3892,68 +3901,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1347
+#: src/localplayer.cpp:1365
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1349
+#: src/localplayer.cpp:1367
 msgid "Item is too far away"
 msgstr "Este item está muito longe."
 
-#: src/localplayer.cpp:1351
+#: src/localplayer.cpp:1369
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1353
+#: src/localplayer.cpp:1371
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1356
+#: src/localplayer.cpp:1374
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1359
+#: src/localplayer.cpp:1377
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. 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] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3110
+#: src/localplayer.cpp:3132
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3408
+#: src/localplayer.cpp:3430
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
+#: src/localplayer.cpp:3432 src/localplayer.cpp:3447
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 msgid "You see "
 msgstr "Você vê "
 
@@ -5100,39 +5109,39 @@ msgstr "Você é um ex-jogador"
 msgid "You're pining for the fjords."
 msgstr "Você foi desta para melhor."
 
-#: 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 "Mensagem"
 
-#: 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 ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: 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 ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, c-format
 msgid "You picked up %s."
 msgstr "Você pegou %s."
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, c-format
 msgid "You spent %s."
 msgstr "Você gastou %s"
 
-#: src/net/tmwa/playerhandler.cpp:499
+#: src/net/tmwa/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr "Impossível aumentar o atributo!"
 
-#: src/net/tmwa/playerhandler.cpp:619
+#: src/net/tmwa/playerhandler.cpp:627
 msgid "Equip arrows first."
 msgstr "Equipe as flechas primeiro."
 
@@ -5306,3 +5315,11 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Item desconhecido"
+
+#, fuzzy
+#~ msgid "@@remove attack|Remove from ignore list@@"
+#~ msgstr "@@remove map|Remover do mapa@@"
+
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Selecionar Mundo"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index dd979d4ca..14398032a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\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: 2011-04-15 17:33+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazilian) <>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
@@ -29,87 +29,87 @@ msgstr "desviou"
 msgid "miss"
 msgstr "errou"
 
-#: 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 "Configurar"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: 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 "Erro"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1143
+#: src/client.cpp:1139
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: 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 "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1535
+#: src/client.cpp:1531
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -365,7 +365,7 @@ msgid "Buy"
 msgstr "Comprar"
 
 #: 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 "Preço: %s / Total: %s"
@@ -388,7 +388,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 "Sair"
 
@@ -411,12 +411,12 @@ msgstr "Vender"
 #: 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"
@@ -516,8 +516,8 @@ msgstr "Estilo do Cabelo:"
 msgid "Race:"
 msgstr "Corrida:"
 
-#: 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 "Criar"
 
@@ -529,20 +529,20 @@ msgstr "Homem"
 msgid "Female"
 msgstr "Mulher"
 
-#: 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 "Por favor distribua %d pontos"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -572,22 +572,22 @@ msgstr "Cancelar Registro"
 msgid "Change Email"
 msgstr "Alterar email"
 
-#: 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 "Excluir"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 msgid "Choose"
 msgstr "Escolher"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, c-format
 msgid "Level %d"
 msgstr "Nível %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr "(vazio)"
 
@@ -800,8 +800,8 @@ msgstr "Equipamento"
 
 #: 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 "Desequipar"
 
@@ -844,26 +844,26 @@ msgid "id"
 msgstr "id"
 
 #: 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 "Equipar"
 
 #: 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 "Usar"
 
 #: 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 "Descartar..."
 
-#: 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 "Dividir"
 
@@ -877,18 +877,18 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: 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 "Armazenar"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: 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 "Descartar"
 
@@ -1067,7 +1067,7 @@ msgstr "Passar"
 msgid "Login"
 msgstr "Login"
 
-#: 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 "Servidor:"
@@ -1321,15 +1321,15 @@ msgstr "@@talk|Conversar@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Expulsar@@"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:262
 #, fuzzy
 msgid "@@remove attack|Remove from attack list@@"
 msgstr "@@remove map|Remover do mapa@@"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:267
 #, fuzzy
-msgid "@@remove attack|Remove from ignore list@@"
-msgstr "@@remove map|Remover do mapa@@"
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|Atacar@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1381,7 +1381,7 @@ msgstr "@@remove map|Remover do mapa@@"
 msgid "@@load old outfits|Load old outfits@@"
 msgstr "@@load old outfits|Carregar antigos roupas@@"
 
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr "Feitiços"
 
@@ -1442,84 +1442,89 @@ msgstr "Renomear mapa          "
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: 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 "Nome no chat"
 
-#: 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 "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1525
+#: src/gui/popupmenu.cpp:1602
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
+#: src/gui/popupmenu.cpp:1628 src/gui/popupmenu.cpp:1661
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
+#: src/gui/popupmenu.cpp:1634 src/gui/popupmenu.cpp:1667
 msgid "Show"
 msgstr "Mostrar"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "padrão"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Mover para Cima"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Mover para Baixo"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Remover o nome"
@@ -1568,60 +1573,60 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:235
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:250
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 msgid "Custom Server"
 msgstr "Servidor customizado"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:513
+#: src/gui/serverdialog.cpp:521
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:526
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:522
+#: src/gui/serverdialog.cpp:530
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:526
+#: src/gui/serverdialog.cpp:534
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:624
+#: src/gui/serverdialog.cpp:632
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:634
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -2036,8 +2041,8 @@ msgstr "Fonte de ajuda"
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: 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 "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2188,7 +2193,7 @@ msgid "FPS limit:"
 msgstr "Limite FPS:"
 
 #: 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 "Limite FPS alt: "
 
@@ -2217,62 +2222,62 @@ msgid "Font size"
 msgstr "Tamanho da fonte"
 
 #: 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 "Nenhum"
 
-#: 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 ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: 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 ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:700
+#: src/gui/setup_video.cpp:703
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:701
+#: src/gui/setup_video.cpp:704
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: 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 "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:722
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:753
+#: src/gui/setup_video.cpp:756
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -2417,126 +2422,130 @@ msgid "Atk"
 msgstr "Atacar"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Selecionar Mundo"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Atacar"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Nome de Ignorados"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:996 src/gui/windowmenu.cpp:90
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017
 msgid "Invite"
 msgstr "Convidar"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1228
+#: src/gui/socialwindow.cpp:1263
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1242
+#: src/gui/socialwindow.cpp:1277
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1371
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
-#: src/gui/socialwindow.cpp:1341
+#: src/gui/socialwindow.cpp:1376
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr "Especiais"
 
@@ -3362,11 +3371,11 @@ msgstr "Comando: /kick <nick>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Retirar <nick> do canal."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "É preciso um usuário para dar op!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "É preciso um usuário para expulsar!"
 
@@ -3465,31 +3474,31 @@ msgstr "INV"
 msgid "SKI"
 msgstr "HAB"
 
-#: src/gui/windowmenu.cpp:84
+#: src/gui/windowmenu.cpp:85
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "SH"
 msgstr "AT"
 
-#: src/gui/windowmenu.cpp:89
+#: src/gui/windowmenu.cpp:91
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: src/gui/windowmenu.cpp:91
+#: src/gui/windowmenu.cpp:93
 msgid "SP"
 msgstr "FE"
 
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:94
 msgid "DR"
 msgstr "DE"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SET"
 msgstr "CON"
 
@@ -3892,68 +3901,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1347
+#: src/localplayer.cpp:1365
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1349
+#: src/localplayer.cpp:1367
 msgid "Item is too far away"
 msgstr "Este item está muito longe."
 
-#: src/localplayer.cpp:1351
+#: src/localplayer.cpp:1369
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1353
+#: src/localplayer.cpp:1371
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1356
+#: src/localplayer.cpp:1374
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1359
+#: src/localplayer.cpp:1377
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. 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] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3110
+#: src/localplayer.cpp:3132
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3408
+#: src/localplayer.cpp:3430
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
+#: src/localplayer.cpp:3432 src/localplayer.cpp:3447
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 msgid "You see "
 msgstr "Você vê "
 
@@ -5100,39 +5109,39 @@ msgstr "Você é um ex-jogador"
 msgid "You're pining for the fjords."
 msgstr "Você foi desta para melhor."
 
-#: 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 "Mensagem"
 
-#: 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 ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: 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 ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, c-format
 msgid "You picked up %s."
 msgstr "Você pegou %s."
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, c-format
 msgid "You spent %s."
 msgstr "Você gastou %s"
 
-#: src/net/tmwa/playerhandler.cpp:499
+#: src/net/tmwa/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr "Impossível aumentar o atributo!"
 
-#: src/net/tmwa/playerhandler.cpp:619
+#: src/net/tmwa/playerhandler.cpp:627
 msgid "Equip arrows first."
 msgstr "Equipe as flechas primeiro."
 
@@ -5306,3 +5315,11 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Item desconhecido"
+
+#, fuzzy
+#~ msgid "@@remove attack|Remove from ignore list@@"
+#~ msgstr "@@remove map|Remover do mapa@@"
+
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Selecionar Mundo"
diff --git a/po/ru.po b/po/ru.po
index cfefd8657..f41712191 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\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: 2011-04-15 17:35+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian <>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: src/actorspritemanager.cpp: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 "Сменить Email"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: 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 "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1535
+#: src/client.cpp:1531
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: 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 "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -372,7 +372,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 "Цена: %s / Всего: %s"
@@ -395,7 +395,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 "Выход"
 
@@ -418,12 +418,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"
@@ -523,8 +523,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 "Создать"
 
@@ -536,20 +536,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 "Распределите очки (%d)"
 
-#: 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 "Снимите очки (%d)"
@@ -579,22 +579,22 @@ msgstr "Удалить регистрацию"
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
-#: 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 "Уровень: %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr "(пусто)"
 
@@ -807,8 +807,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 "Снять"
 
@@ -851,26 +851,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 "Разделить"
 
@@ -884,18 +884,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 "Бросить"
 
@@ -1074,7 +1074,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 "Сервер:"
@@ -1328,15 +1328,15 @@ msgstr "@@talk|Говорить@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Вышвырнуть игрока@@"
 
-#: src/gui/popupmenu.cpp:260
+#: src/gui/popupmenu.cpp:262
 #, fuzzy
 msgid "@@remove attack|Remove from attack list@@"
 msgstr "@@remove map|Удалить@@"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:267
 #, fuzzy
-msgid "@@remove attack|Remove from ignore list@@"
-msgstr "@@remove map|Удалить@@"
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|Атаковать@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1388,7 +1388,7 @@ msgstr "@@remove map|Удалить@@"
 msgid "@@load old outfits|Load old outfits@@"
 msgstr "@@load old outfits|Загрузить старые наряды@@"
 
-#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr "Заклинания"
 
@@ -1449,84 +1449,89 @@ 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 "Добавить к торговле 10"
 
-#: 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 "Сохранить 10"
 
-#: 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 "Получить 10"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "По умолчанию"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Движение вверх"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 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
 #, fuzzy
 msgid "Remove"
 msgstr "Скрывать имя"
@@ -1575,60 +1580,60 @@ msgstr "Пароль не должен содержать более %d симв
 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 "Использовать одинаковый IP для игровых суб-серверов"
 
-#: 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 "Получение списка серверов...%2.2f%%"
 
-#: 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 "требуется v%s"
@@ -2043,8 +2048,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 "Перезегрузите игру дабы изменения вступили в силу."
 
@@ -2195,7 +2200,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 "Альтер. ограничить кадр/с: "
 
@@ -2224,64 +2229,64 @@ 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 "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
 
-#: src/gui/setup_video.cpp:700
+#: src/gui/setup_video.cpp:703
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
-#: 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 "Изменения вступят в силу после загрузки новой карты."
 
@@ -2426,126 +2431,130 @@ msgid "Atk"
 msgstr "Атака"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Выбрать Сервер"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Атака"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 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 "Принято приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
-#: src/gui/socialwindow.cpp:1228
+#: src/gui/socialwindow.cpp:1263
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
-#: 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 "%s приглашает присоединиться к гильдии %s."
 
-#: 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 "Вас приглашают присоединиться к группе %s."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает вас к себе в группу."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: 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 "Особые"
 
@@ -3372,11 +3381,11 @@ msgstr "Команда: /kick <ник>"
 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 "Нужно выбрать пользователя!"
 
@@ -3476,31 +3485,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 "SET"
 
@@ -3903,41 +3912,41 @@ msgstr ""
 "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
 "вести."
 
-#: 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@@]."
@@ -3945,27 +3954,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: 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 "Вы видите "
 
@@ -5107,39 +5116,39 @@ 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 "Вы получили %s."
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, c-format
 msgid "You spent %s."
 msgstr "Вы потратили %s."
 
-#: 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 "Для начала экипируйтесь стрелами!"
 
@@ -5313,3 +5322,11 @@ msgstr "Мана %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
+
+#, fuzzy
+#~ msgid "@@remove attack|Remove from ignore list@@"
+#~ msgstr "@@remove map|Удалить@@"
+
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Выбрать Сервер"
diff --git a/po/sv.po b/po/sv.po
index 30bb956e7..4c9619d3f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-22 00:47+0300\n"
+"POT-Creation-Date: 2011-04-27 22:33+0300\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/actorspritemanager.cpp:1005
+#: src/actorspritemanager.cpp:1012
 #, fuzzy
 msgid "Visible on map"
 msgstr "Synliga namn"
@@ -32,96 +32,96 @@ 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 "Inställningar"
 
-#: src/client.cpp:826
+#: src/client.cpp:822
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Ansluter till kartservern..."
 
-#: src/client.cpp:857
+#: src/client.cpp:853
 #, fuzzy
 msgid "Logging in"
 msgstr "Användarnamn"
 
-#: src/client.cpp:890
+#: src/client.cpp:886
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:982
+#: src/client.cpp:978
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Välj karaktär"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1009
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Ansluter till kartservern..."
 
-#: src/client.cpp:1023
+#: src/client.cpp:1019
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: 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 "Fel"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1070
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1101
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Password Change"
 msgstr "Lösenord:"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1098
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1117
 #, fuzzy
 msgid "Email Change"
 msgstr "Ändra"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1118
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Medlem befordrad."
 
-#: src/client.cpp:1142
+#: src/client.cpp:1138
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Avregistrera"
 
-#: 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
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ogiltig uppdateringsvärd: "
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1565 src/client.cpp:1571
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1592
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -393,7 +393,7 @@ msgid "Buy"
 msgstr "Köp"
 
 #: 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 "Pris: %s / Totalt: %s"
@@ -416,7 +416,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 "Avsluta"
 
@@ -439,12 +439,12 @@ msgstr "Sälj"
 #: 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"
@@ -549,8 +549,8 @@ msgstr "Frisyr:"
 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 "Skapa"
 
@@ -562,20 +562,20 @@ msgstr "Man"
 msgid "Female"
 msgstr "Kvinna"
 
-#: 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 "Var vänlig fördela %d poäng"
 
-#: src/gui/charcreatedialog.cpp:212
+#: src/gui/charcreatedialog.cpp:217
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
-#: src/gui/charcreatedialog.cpp:284
+#: src/gui/charcreatedialog.cpp:289
 msgid "Character stats OK"
 msgstr "Karaktärens värden okej"
 
-#: src/gui/charcreatedialog.cpp:298
+#: src/gui/charcreatedialog.cpp:303
 #, c-format
 msgid "Please remove %d points"
 msgstr "Var vänlig ta bort %d poäng"
@@ -606,23 +606,23 @@ msgstr "Avregistrera"
 msgid "Change Email"
 msgstr "Ändra epostadress"
 
-#: 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 "Ta bort"
 
-#: src/gui/charselectdialog.cpp:435
+#: src/gui/charselectdialog.cpp:437
 #, fuzzy
 msgid "Choose"
 msgstr "Stäng"
 
-#: src/gui/charselectdialog.cpp:438
+#: src/gui/charselectdialog.cpp:440
 #, fuzzy, c-format
 msgid "Level %d"
 msgstr "Nivå: %d"
 
-#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
+#: src/gui/charselectdialog.cpp:451 src/gui/charselectdialog.cpp:452
 msgid "(empty)"
 msgstr ""
 
@@ -856,8 +856,8 @@ msgstr "Utrustning"
 
 #: 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 "Avrusta"
 
@@ -903,27 +903,27 @@ 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 "Utrusta"
 
 #: 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 "Använd"
 
 #: 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
 #, fuzzy
 msgid "Drop..."
 msgstr "Släpp"
 
-#: 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 "Dela"
 
@@ -937,18 +937,18 @@ msgid "Weight:"
 msgstr "Vikt:"
 
 #: 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 "Lagra"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1478
 msgid "Retrieve"
 msgstr "Hämta"
 
-#: 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 "Släpp"
 
@@ -1135,7 +1135,7 @@ msgstr ""
 msgid "Login"
 msgstr "Användarnamn"
 
-#: 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 "Server:"
@@ -1418,13 +1418,14 @@ msgstr "@@attack|Attackera %s@@"
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Sparka spelare@@"
 
-#: 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@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:267
+#, fuzzy
+msgid "@@add attack priority|Add to priority attack list@@"
+msgstr "@@attack|Attackera %s@@"
 
 #: src/gui/popupmenu.cpp:270
 #, fuzzy
@@ -1479,7 +1480,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 ""
 
@@ -1547,95 +1548,100 @@ msgstr ""
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1345
+#: src/gui/popupmenu.cpp:1422
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:1351
+#: src/gui/popupmenu.cpp:1428
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:1354
+#: src/gui/popupmenu.cpp:1431
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1356
+#: src/gui/popupmenu.cpp:1433
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1368
+#: src/gui/popupmenu.cpp:1445
 #, fuzzy
 msgid "Store 10"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1371
+#: src/gui/popupmenu.cpp:1448
 #, fuzzy
 msgid "Store half"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1450
 #, fuzzy
 msgid "Store all"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1407
+#: src/gui/popupmenu.cpp:1484
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1410
+#: src/gui/popupmenu.cpp:1487
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1412
+#: src/gui/popupmenu.cpp:1489
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Hämta"
 
-#: 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
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: 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
 #, fuzzy
 msgid "(default)"
 msgstr "Förval"
 
-#: src/gui/popupmenu.cpp:1622
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1722
 #, fuzzy
 msgid "Move up"
 msgstr "Gå uppåt"
 
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1727
 #, fuzzy
 msgid "Move down"
 msgstr "Gå nedåt"
 
-#: 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
 #, fuzzy
 msgid "Remove"
 msgstr "Kom ihåg användarnamnet"
@@ -1684,65 +1690,65 @@ msgstr "Lösenordet måste vara kortare än %d tecken."
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: src/gui/serverdialog.cpp:212
+#: src/gui/serverdialog.cpp:216
 #, fuzzy
 msgid "Choose Your Server"
 msgstr "Välj din server"
 
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:232
 msgid "Port:"
 msgstr "Port:"
 
-#: 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
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:266
 #, fuzzy
 msgid "Connect"
 msgstr "Ansluter..."
 
-#: src/gui/serverdialog.cpp:263
+#: src/gui/serverdialog.cpp:267
 #, fuzzy
 msgid "Custom Server"
 msgstr "Särskild muspekare"
 
-#: src/gui/serverdialog.cpp:370
+#: src/gui/serverdialog.cpp:374
 msgid "Please type both the address and the port of a server."
 msgstr "Var vänlig skriv både adressen och porten till en server."
 
-#: 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
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Väntar på server"
 
-#: 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 ""
@@ -2186,8 +2192,8 @@ msgstr "Hjälp"
 msgid "Theme Changed"
 msgstr "Ändra"
 
-#: 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 "Starta om din klient för att ändringen ska börja gälla."
 
@@ -2348,7 +2354,7 @@ msgid "FPS limit:"
 msgstr "FPS-gräns:"
 
 #: 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
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS-gräns:"
@@ -2379,65 +2385,65 @@ msgid "Font size"
 msgstr "Typsnittsgrad"
 
 #: 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
 #, fuzzy
 msgid "None"
 msgstr "Nej"
 
-#: src/gui/setup_video.cpp:531
+#: src/gui/setup_video.cpp:533
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "läge och återgång till det gamla läget misslyckades också!"
 
-#: src/gui/setup_video.cpp:537
+#: src/gui/setup_video.cpp:539
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "läge och återgång till det gamla läget misslyckades också!"
 
-#: src/gui/setup_video.cpp:548
+#: src/gui/setup_video.cpp:550
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Byte till helskärm"
 
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:551
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:563
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Ändrar OpenGL"
 
-#: src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:564
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: 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
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Skärmupplösning ändrad"
 
-#: 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
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Inställningar för partikeleffekter ändrade."
 
-#: src/gui/setup_video.cpp:754
+#: src/gui/setup_video.cpp:757
 msgid "Changes will take effect on map change."
 msgstr "Förändringar kommer att börja gälla när du byter karta."
 
@@ -2584,136 +2590,140 @@ msgid "Atk"
 msgstr "Attackera"
 
 #: src/gui/socialwindow.cpp:823
-#, fuzzy
-msgid "Selected mobs"
-msgstr "Välj okej"
+msgid "Priority mobs"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:855
 #, fuzzy
+msgid "Attack mobs"
+msgstr "Attackera"
+
+#: src/gui/socialwindow.cpp:890
+#, fuzzy
 msgid "Ignore mobs"
 msgstr "Ignorerad"
 
-#: src/gui/socialwindow.cpp:918
+#: src/gui/socialwindow.cpp:953
 msgid "Create Guild"
 msgstr "Skapa gille"
 
-#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
+#: src/gui/socialwindow.cpp:954 src/gui/socialwindow.cpp:1370
 #, fuzzy
 msgid "Create Party"
 msgstr "Skapa karaktär"
 
-#: 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
 #, fuzzy
 msgid "Invite"
 msgstr "Bjud in spelare"
 
-#: src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/socialwindow.cpp:1124
+#: src/gui/socialwindow.cpp:1159
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepterade injudan från %s."
 
-#: src/gui/socialwindow.cpp:1134
+#: src/gui/socialwindow.cpp:1169
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Avslog inbjudan från %s."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1186
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepterade injudan från %s."
 
-#: src/gui/socialwindow.cpp:1161
+#: src/gui/socialwindow.cpp:1196
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Avslog inbjudan från %s."
 
-#: src/gui/socialwindow.cpp:1205
+#: src/gui/socialwindow.cpp:1240
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Kunde inte skapa gille."
 
-#: 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
 #, fuzzy
 msgid "Guild Name"
 msgstr "Gille"
 
-#: src/gui/socialwindow.cpp:1243
+#: src/gui/socialwindow.cpp:1278
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Välj din server"
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1292
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/socialwindow.cpp:1263
+#: src/gui/socialwindow.cpp:1298
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/socialwindow.cpp:1269
+#: src/gui/socialwindow.cpp:1304
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/socialwindow.cpp:1284
+#: src/gui/socialwindow.cpp:1319
 msgid "Received party request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1330
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s har bjudit in dig till sin grupp."
 
-#: src/gui/socialwindow.cpp:1299
+#: src/gui/socialwindow.cpp:1334
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/socialwindow.cpp:1307
+#: src/gui/socialwindow.cpp:1342
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig till sin grupp."
 
-#: src/gui/socialwindow.cpp:1312
+#: src/gui/socialwindow.cpp:1347
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1356
 msgid "Accept Party Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: 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
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupp"
 
-#: src/gui/socialwindow.cpp:1342
+#: src/gui/socialwindow.cpp:1377
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Välj din server"
 
-#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:85
 msgid "Specials"
 msgstr ""
 
@@ -3581,11 +3591,11 @@ msgstr "Kommando: /kick <spelare>"
 msgid "This command makes <nick> leave the channel."
 msgstr "Det här kommandot sparkar ut <spelare> ur chattkanalen."
 
-#: src/gui/widgets/channeltab.cpp:120
+#: src/gui/widgets/channeltab.cpp:116
 msgid "Need a user to op!"
 msgstr "Du måste ange vilken spelare som ska få operatörsstatus!"
 
-#: src/gui/widgets/channeltab.cpp:127
+#: src/gui/widgets/channeltab.cpp:123
 msgid "Need a user to kick!"
 msgstr "Du måste ange vilken spelare som ska sparkas ut!"
 
@@ -3689,32 +3699,32 @@ 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
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-#: 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 ""
 
@@ -4142,74 +4152,74 @@ msgid ""
 "strange behaviour."
 msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
 
-#: src/localplayer.cpp:339
+#: src/localplayer.cpp:345
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1345
+#: src/localplayer.cpp:1363
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Kunde inte plocka upp."
 
-#: 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
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Servern är full"
 
-#: 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
 #, fuzzy
 msgid "Unknown problem picking up item."
 msgstr "Kunde inte plocka upp."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1384
+#: src/localplayer.cpp:1402
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Du plockade upp %s [@@%d|%s@@]."
 msgstr[1] "Du plockade upp %s [@@%d|%s@@]."
 
-#: 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
 #, fuzzy
 msgid "Follow canceled"
 msgstr " avbruten"
 
-#: src/localplayer.cpp:3417
+#: src/localplayer.cpp:3439
 #, fuzzy
 msgid "Imitation: "
 msgstr "Ändra epostadress"
 
-#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
+#: src/localplayer.cpp:3441 src/localplayer.cpp:3449
 #, fuzzy
 msgid "Imitation canceled"
 msgstr " avbruten"
 
-#: src/localplayer.cpp:3779
+#: src/localplayer.cpp:3801
 #, fuzzy
 msgid "You see "
 msgstr "Du får %s."
@@ -5446,36 +5456,36 @@ msgstr "Du är en före detta spelare."
 msgid "You're pining for the fjords."
 msgstr "Du har gått till de sälla jaktmarkerna."
 
-#: 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 "Meddelande"
 
-#: 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 "Du bär mer än halva din vikt på dig. Du kan inte återfå hälsa."
 
-#: src/net/tmwa/playerhandler.cpp:343
+#: src/net/tmwa/playerhandler.cpp:351
 #, fuzzy
 msgid "You are carrying less than half your weight. You are can regain health."
 msgstr "Du bär mer än halva din vikt på dig. Du kan inte återfå hälsa."
 
-#: src/net/tmwa/playerhandler.cpp:448
+#: src/net/tmwa/playerhandler.cpp:456
 #, fuzzy, c-format
 msgid "You picked up %s."
 msgstr "Du plockade upp "
 
-#: src/net/tmwa/playerhandler.cpp:454
+#: src/net/tmwa/playerhandler.cpp:462
 #, fuzzy, c-format
 msgid "You spent %s."
 msgstr "Du får %s."
 
-#: 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 "Utrusta dig med pilar först."
 
@@ -5655,6 +5665,10 @@ msgstr "Mana %+d"
 msgid "Unknown item"
 msgstr "Okänt föremål"
 
+#, fuzzy
+#~ msgid "Selected mobs"
+#~ msgstr "Välj okej"
+
 #~ msgid "-- Help --"
 #~ msgstr "-- Hjälp --"