Rebuild language files.

author: Andrei Karas <akaras@inbox.ru> 2011-04-22 02:23:13 +0300
committer: Andrei Karas <akaras@inbox.ru> 2011-04-22 02:23:13 +0300
commit: c5808ea0d60620d3c9768b2ca63398f5f62309e3 (patch)
tree: 4f7d6e90d8f971e62171f064f25477ee95265140
parent: f6e795cc95dce10e1df44a89bd03539e72888a32 (diff)
download: manaverse-c5808ea0d60620d3c9768b2ca63398f5f62309e3.tar.gz
manaverse-c5808ea0d60620d3c9768b2ca63398f5f62309e3.tar.bz2
manaverse-c5808ea0d60620d3c9768b2ca63398f5f62309e3.tar.xz
manaverse-c5808ea0d60620d3c9768b2ca63398f5f62309e3.zip
16 files changed, 5042 insertions, 4130 deletions
diff --git a/po/da.po b/po/da.po
index e30ea90d1..94ba54d0a 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-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+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:909
+#: src/actorspritemanager.cpp:1005
 #, fuzzy
 msgid "Visible on map"
 msgstr "Synlige navne"
@@ -125,165 +125,165 @@ msgstr "Fejl under oprettelsen af opdateringen mappen!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Ukendt kommando"
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "du kan ikke sende en hviskebesked uden tekst!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Du glemte at skrive et navn på dit party."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Du glemte at skrive et navn på dit party."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "Retur bringer focus på chatten."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "Besked lukker chat."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "Enter bringer nu focus på chatten."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Besked lukker nu chat."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 #, fuzzy
 msgid "friend"
 msgstr "Ven"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 #, fuzzy
 msgid "disregarded"
 msgstr "Se bort fra"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 #, fuzzy
 msgid "neutral"
 msgstr "Neutral"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Du har nu oprettet gruppen."
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Du har nu oprettet gruppen."
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Beskeden blev ikke læst. Modtageren ignorerer den."
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 #, fuzzy
 msgid "font cache size"
 msgstr "Skriftstørrelse"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 #, fuzzy
 msgid "Created: "
 msgstr "Opret"
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 #, fuzzy
 msgid "Deleted: "
 msgstr "Slet"
@@ -293,46 +293,46 @@ msgstr "Slet"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Skærmbillede gemt under ~/"
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Netværksfejl"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerer indkomne handels anmodninger"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Accepterer indkomne handels anmodninger"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Kunne ikke loade kortet"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunne ikke loade %s."
@@ -435,13 +435,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Fortryd"
 
@@ -545,7 +546,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Opret"
 
@@ -603,7 +604,7 @@ msgstr "Skift e-mail adresse"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Slet"
 
@@ -699,12 +700,12 @@ msgstr "???"
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Der er %d spillere til stede"
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til %s: %s"
@@ -851,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Tag af"
 
@@ -898,32 +899,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Tag på"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Brug"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 #, fuzzy
 msgid "Drop..."
 msgstr "Smid"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Opdel"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr ""
 
@@ -932,17 +933,17 @@ msgid "Weight:"
 msgstr "Vægt:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Gem på lager"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Smid"
@@ -1221,7 +1222,7 @@ msgstr "Send forespørgsel"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 #, fuzzy
 msgid "Clear"
 msgstr "Hellebard"
@@ -1263,110 +1264,110 @@ msgstr "Tag af"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Handl med %s@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Angrib %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Brug@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Annuller@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "@@friend|Be friend@@"
 msgstr "@@retrieve|Hent fra lager@@"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "@@disregard|Disregard@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorer %s@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Brug@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Hold op med at ignorere %s@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore||Ignorer %s fuldstændigt@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Inviter en spiller til din gruppe"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Spark spiller ud@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Spark spiller ud@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Inviter en spiller til din gruppe"
@@ -1380,22 +1381,22 @@ msgid "@@nuke|Nuke@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Hold op med at ignorere %s@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Brug@@"
@@ -1405,195 +1406,233 @@ msgstr "@@use|Brug@@"
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Angrib %s@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Spark spiller ud@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+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:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|Angrib %s@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Tilføj navn til chat@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuller@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Saml %s op@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Brug@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Fremhæv tab"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Fremhæv tab"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 #, fuzzy
 msgid "Remove name"
 msgstr "Husk Brugernavn"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 #, fuzzy
 msgid "Enable away"
 msgstr "Du kan ikke købe."
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "Disable away"
 msgstr "Slå handler fra/til"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 #, fuzzy
 msgid "Change guild position"
 msgstr "Ændre"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 #, fuzzy
 msgid "Store 10"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 #, fuzzy
 msgid "Store half"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 #, fuzzy
 msgid "Store all"
 msgstr "Gem på lager"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Hent fra lager"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Tilføj til chat@@"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "Standard"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Flyt op"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Flyt ned"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Husk Brugernavn"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr ""
@@ -1800,7 +1839,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr ""
 
@@ -1926,116 +1965,121 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr "Tast Konfikt(er) Opdaget."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Fremhæv"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Vis navn"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Aktiver joystick"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Fremhæv"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Slå handler fra/til"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Du kan ikke købe."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Du kan ikke købe."
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Aktiver joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "som partikeleffekt"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Vis navn"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr ""
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Du kan ikke købe."
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relation"
@@ -2135,8 +2179,8 @@ msgstr "Hjælp"
 msgid "Theme Changed"
 msgstr "Ændre"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
@@ -2296,8 +2340,8 @@ msgstr "Baggrund"
 msgid "FPS limit:"
 msgstr "FPS-grænse:"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS-grænse:"
@@ -2327,66 +2371,66 @@ msgstr "Partikeldetaljer"
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 #, fuzzy
 msgid "None"
 msgstr "Nej"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 #, 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:535
+#: src/gui/setup_video.cpp:537
 #, 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:546
+#: src/gui/setup_video.cpp:548
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Skifter til fuld skærm"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Skrifter til OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Skærmopløsning ændret"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:751
+#: src/gui/setup_video.cpp:753
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Ændrede Partikeleffekter."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "Ændringerne træder i kraft når du er går til et nyt kort."
 
@@ -2523,125 +2567,140 @@ msgstr ""
 msgid "Are you sure you want to leave party %s?"
 msgstr "ER du sikker på at du vil afslutte programmet?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Angrib"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Vælg OK"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Ignorer"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 #, fuzzy
 msgid "Create Party"
 msgstr "Lav en ny karakter."
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 #, fuzzy
 msgid "Invite"
 msgstr "Inviter en spiller"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Du har accepteret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Du har ignoreret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Du har accepteret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Du har ignoreret en invitation fra %s."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Der opstod en fejl. Guilden kunne ikke oprettes"
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 #, fuzzy
 msgid "Guild Name"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Vælg din server"
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, 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:1121
+#: src/gui/socialwindow.cpp:1269
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accepter invitationen"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s har inviteret med i sin gruppe"
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, 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:1159
+#: src/gui/socialwindow.cpp:1307
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har inviteret med i sin gruppe"
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Accepter invitationen"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1341
 #, fuzzy
 msgid "Party Name"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Vælg din server"
@@ -3143,30 +3202,30 @@ msgstr "Kommando: /who"
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 #, fuzzy
 msgid "Target Type:"
 msgstr "Vælg spiller som ny modstander"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 #, fuzzy
 msgid "Magic level:"
 msgstr "Maks. level"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 #, fuzzy
 msgid "School level:"
 msgstr "Vis navn"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr ""
 
@@ -4081,73 +4140,73 @@ msgid ""
 "strange behaviour."
 msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Du kunne ikke bruge denne genstand."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Serveren er fuld"
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Handel annulleret."
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 #, fuzzy
 msgid "Imitation: "
 msgstr "Skift e-mail adresse"
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Handel annulleret."
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 #, fuzzy
 msgid "You see "
 msgstr "Du får %s."
diff --git a/po/de.po b/po/de.po
index 575e954a5..d2688d5e3 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-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+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:909
+#: src/actorspritemanager.cpp:1005
 #, fuzzy
 msgid "Visible on map"
 msgstr "Sichtbare Namen"
@@ -143,15 +143,15 @@ msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,152 +160,152 @@ msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
 "einer, oder der Spieler bist du."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "Enter-Taste schließt Chatzeile."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "Nachricht schließt Chatzeile."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "Jetzt schließt Enter die Chatzeile."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Jetzt schließt jede Nachricht die Chatzeile."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 msgid "friend"
 msgstr "Freund"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 #, fuzzy
 msgid "disregarded"
 msgstr "Unbeachtet"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 #, fuzzy
 msgid "neutral"
 msgstr "Neutral"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Spieler wird bereits ignoriert!"
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Party erfolgreich erstellt."
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Spieler wird bereits ignoriert!"
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Party erfolgreich erstellt."
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 #, fuzzy
 msgid "font cache size"
 msgstr "Schriftgröße"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 #, fuzzy
 msgid "Created: "
 msgstr "Erstellen"
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 #, fuzzy
 msgid "Deleted: "
 msgstr "Löschen"
@@ -316,47 +316,47 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Öffentlich"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Bildschirmfoto wurde nach ~/ gespeichert."
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr ""
 "Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -458,13 +458,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -563,7 +564,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Erstellen"
 
@@ -620,7 +621,7 @@ msgstr "E-Mailadresse ändern"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Löschen"
 
@@ -711,12 +712,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
@@ -863,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -910,31 +911,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Benutzen"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Aufteilen"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr "Ausrüstung"
 
@@ -943,17 +944,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Einlagern"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -1231,7 +1232,7 @@ msgstr "Absenden"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 #, fuzzy
 msgid "Clear"
 msgstr "Waffenarm"
@@ -1275,101 +1276,101 @@ msgstr "erstes ausziehen"
 msgid "Away outfit"
 msgstr "Ausrüstung anziehen"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 msgid "@@trade|Trade@@"
 msgstr ""
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 msgid "@@attack|Attack@@"
 msgstr ""
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 msgid "@@whisper|Whisper@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 msgid "@@heal|Heal@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "@@friend|Be friend@@"
 msgstr "/ignore > Ignoriere einen Spieler"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "@@disregard|Disregard@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 msgid "@@ignore|Ignore@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 msgid "@@erase|Erase@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 msgid "@@unignore|Unignore@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Lade einen Benutzer zu deiner Party ein"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 msgid "@@kick party|Kick from party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 msgid "@@guild-kick|Kick from guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 msgid "@@guild|Invite to guild@@"
 msgstr ""
 
@@ -1382,21 +1383,21 @@ msgid "@@nuke|Nuke@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 msgid "@@undress|Undress@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 msgid "@@sell|Sell@@"
 msgstr ""
 
@@ -1404,192 +1405,230 @@ msgstr ""
 msgid "@@talk|Talk@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 msgid "@@admin-kick|Kick@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+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:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "Zu Chat hinzufügen"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "Füge Namen zu Chat hinzu"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 msgid "@@pickup|Pick up@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 msgid "@@edit spell|Edit spell@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Hervorgehobener Tab"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Hervorgehobener Tab"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 #, fuzzy
 msgid "Remove name"
 msgstr "Benutzername merken"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 #, fuzzy
 msgid "Enable away"
 msgstr "Kauf fehlgeschlagen."
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "Disable away"
 msgstr "Handeln erlauben/verbieten"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 #, fuzzy
 msgid "Change guild position"
 msgstr "Ändern"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 #, fuzzy
 msgid "Add to trade"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 #, fuzzy
 msgid "Store 10"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 #, fuzzy
 msgid "Store half"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 #, fuzzy
 msgid "Store all"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Abholen"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Abholen"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Abholen"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 #, fuzzy
 msgid "Show"
 msgstr "Zeigen"
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "Standard"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Laufe Hoch"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Laufe Runter"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Benutzername merken"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr ""
@@ -1793,7 +1832,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr ""
 
@@ -1915,112 +1954,117 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr "Tastenkonflikte entdeckt."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Hervorgehoben"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Joystick aktivieren"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Hervorgehoben"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Joystick aktivieren"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "als Partikeleffekt"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Eigener Name"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr ""
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Joystick aktivieren"
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Beziehung"
@@ -2120,8 +2164,8 @@ msgstr "Hilfe"
 msgid "Theme Changed"
 msgstr "E-Mail ändern"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
 
@@ -2281,8 +2325,8 @@ msgstr "Hintergrund"
 msgid "FPS limit:"
 msgstr "FPS-Limit:"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS-Limit:"
@@ -2312,70 +2356,70 @@ msgstr "Partikeldetail"
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 #, fuzzy
 msgid "None"
 msgstr "Nein"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 #, 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:535
+#: src/gui/setup_video.cpp:537
 #, 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:546
+#: src/gui/setup_video.cpp:548
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Ändere OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Auflösung geändert"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 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:751
+#: src/gui/setup_video.cpp:753
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Partikeleffekteinstellungen geändert."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
@@ -2514,124 +2558,139 @@ msgstr "Partie verlassen?"
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Angriff"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "OK auswählen"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Ignoriere %s"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 #, fuzzy
 msgid "Create Party"
 msgstr "Charakter erstellen"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 #, fuzzy
 msgid "Social"
 msgstr "Special"
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 #, fuzzy
 msgid "Invite"
 msgstr "einladen"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 #, fuzzy
 msgid "Leave"
 msgstr "Stufe: %d"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, fuzzy, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 msgid "Guild Name"
 msgstr "Gildenname"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 #, 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:1115
+#: src/gui/socialwindow.cpp:1263
 #, 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:1121
+#: src/gui/socialwindow.cpp:1269
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 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:1147
+#: src/gui/socialwindow.cpp:1295
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, 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:1159
+#: src/gui/socialwindow.cpp:1307
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Nehme Partyeinladung an"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 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:1193
+#: src/gui/socialwindow.cpp:1341
 #, fuzzy
 msgid "Party Name"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Wähle den Namen deiner Gilde"
@@ -3133,29 +3192,29 @@ msgstr "Befehl: /who"
 msgid "Mana:"
 msgstr "Mana"
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 #, fuzzy
 msgid "Target Type:"
 msgstr "Spieler anvisieren"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 #, fuzzy
 msgid "Magic level:"
 msgstr "Max Level"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr ""
 
@@ -4070,74 +4129,74 @@ msgid ""
 "strange behaviour."
 msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Kann das nicht aufheben."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Server ist voll"
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 #, 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:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 #, fuzzy
 msgid "Follow canceled"
 msgstr " abgebrochen"
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 #, fuzzy
 msgid "Imitation: "
 msgstr "Email-Adresse ändern"
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 #, fuzzy
 msgid "Imitation canceled"
 msgstr " abgebrochen"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 #, fuzzy
 msgid "You see "
 msgstr "Du erhältst %s."
diff --git a/po/en_GB.po b/po/en_GB.po
index 8fdc038c9..25f0c49ab 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-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+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:909
+#: src/actorspritemanager.cpp:1005
 #, fuzzy
 msgid "Visible on map"
 msgstr "Visible names"
@@ -126,15 +126,15 @@ msgstr "Error creating updates directory!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Unknown command."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Cannot send empty whispers!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -143,150 +143,150 @@ msgstr ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Requesting to join channel %s."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Party name is missing."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Party name is missing."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "Return toggles chat."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "Message closes chat."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "Return now toggles chat."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Message now closes chat."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 #, fuzzy
 msgid "friend"
 msgstr "Friend"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 #, fuzzy
 msgid "disregarded"
 msgstr "Disregarded"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 #, fuzzy
 msgid "neutral"
 msgstr "Neutral"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Party successfully created."
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Party successfully created."
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Whisper could not be sent, ignored by user."
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 #, fuzzy
 msgid "font cache size"
 msgstr "Font size"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 #, fuzzy
 msgid "Created: "
 msgstr "Create"
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 #, fuzzy
 msgid "Deleted: "
 msgstr "Delete"
@@ -296,46 +296,46 @@ msgstr "Delete"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Screenshot saved to ~/"
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Saving screenshot failed!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "The connection to the server was lost, the program will now quit."
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Network Error"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoring incoming trade requests"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Accepting incoming trade requests"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Could not load map"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error while loading %s"
@@ -438,13 +438,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -548,7 +549,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Create"
 
@@ -606,7 +607,7 @@ msgstr "Change Email Address"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Delete"
 
@@ -702,12 +703,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d players are present."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
@@ -854,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Unequip"
 
@@ -901,32 +902,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Equip"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Use"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 #, fuzzy
 msgid "Drop..."
 msgstr "Drop"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Split"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr ""
 
@@ -935,17 +936,17 @@ msgid "Weight:"
 msgstr "Weight:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Store"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Drop"
@@ -1224,7 +1225,7 @@ msgstr "Submit"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 #, fuzzy
 msgid "Clear"
 msgstr "Polearm"
@@ -1266,111 +1267,111 @@ msgstr "Unequip"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Trade With %s@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Attack %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Cancel@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "@@friend|Be friend@@"
 msgstr "@@retrieve|Retrieve@@"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Disregard %s@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignore %s@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Use@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Un-Ignore %s@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Completely ignore %s@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Invite a user to party"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Invite a user to party"
@@ -1384,22 +1385,22 @@ msgid "@@nuke|Nuke@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Un-Ignore %s@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Use@@"
@@ -1409,195 +1410,233 @@ msgstr "@@use|Use@@"
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Attack %s@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Kick player@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+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:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|Attack %s@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Add name to chat@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancel@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Pick up %s@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Tab Highlight"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Tab Highlight"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 #, fuzzy
 msgid "Remove name"
 msgstr "Remember Username"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 #, fuzzy
 msgid "Enable away"
 msgstr "Unable to buy."
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "Disable away"
 msgstr "Allow/Disallow Trading"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 #, fuzzy
 msgid "Change guild position"
 msgstr "Change"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 #, fuzzy
 msgid "Store 10"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 #, fuzzy
 msgid "Store half"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 #, fuzzy
 msgid "Store all"
 msgstr "Store"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Retrieve"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Add to chat@@"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "Default"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Move Up"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Move Down"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Remember Username"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr ""
@@ -1804,7 +1843,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr ""
 
@@ -1930,116 +1969,121 @@ msgstr "Default"
 msgid "Key Conflict(s) Detected."
 msgstr "Key Conflict(s) Detected."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Highlight"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Show name"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Enable joystick"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Highlight"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Allow/Disallow Trading"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Unable to buy."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Unable to buy."
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Enable joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "as particle"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Show name"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr ""
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Unable to buy."
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relation"
@@ -2139,8 +2183,8 @@ msgstr "Help"
 msgid "Theme Changed"
 msgstr "Change"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Restart your client for the change to take effect."
 
@@ -2300,8 +2344,8 @@ msgstr "Background"
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS Limit:"
@@ -2331,66 +2375,66 @@ msgstr "Particle Detail"
 msgid "Font size"
 msgstr "Font size"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 #, fuzzy
 msgid "None"
 msgstr "No"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 #, 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:535
+#: src/gui/setup_video.cpp:537
 #, 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:546
+#: src/gui/setup_video.cpp:548
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Switching to full screen"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Changing OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Screen resolution changed"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:751
+#: src/gui/setup_video.cpp:753
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Particle effect settings changed."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "Changes will take effect on map change."
 
@@ -2527,126 +2571,141 @@ msgstr ""
 msgid "Are you sure you want to leave party %s?"
 msgstr "Are you sure you want to quit?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Attack"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Select OK"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Ignored"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Create Guild"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 #, fuzzy
 msgid "Create Party"
 msgstr "Create Character"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 #, fuzzy
 msgid "Invite"
 msgstr "Invite User"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 #, fuzzy
 msgid "Leave"
 msgstr "Large"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepted invite from %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejected invite from %s."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepted invite from %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejected invite from %s."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Error creating guild."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Choose your server"
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Received party request, but one already exists."
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, 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:1121
+#: src/gui/socialwindow.cpp:1269
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr "Received party request, but one already exists."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s has invited you to join their party."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, 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:1159
+#: src/gui/socialwindow.cpp:1307
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s has invited you to join their party."
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1341
 #, fuzzy
 msgid "Party Name"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Choose your server"
@@ -3146,30 +3205,30 @@ msgstr "Command: /who"
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 #, fuzzy
 msgid "Target Type:"
 msgstr "Target Player"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 #, fuzzy
 msgid "Magic level:"
 msgstr "Max level"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 #, fuzzy
 msgid "School level:"
 msgstr "Show name"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr ""
 
@@ -4074,74 +4133,74 @@ msgid ""
 "strange behaviour."
 msgstr "Resolve them, or gameplay may result in strange behaviour."
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Unable to pick up item."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Server is full"
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 #, 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:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Trade canceled."
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 #, fuzzy
 msgid "Imitation: "
 msgstr "Change Email Address"
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Trade canceled."
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 #, fuzzy
 msgid "You see "
 msgstr "You get %s."
diff --git a/po/es.po b/po/es.po
index b689bc548..9367069ef 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,22 +2,22 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+0300\n"
 "PO-Revision-Date: 2011-04-15 17:45+0000\n"
 "Last-Translator: nelson6e65 <nelson6eeduardo65@gmail.com>\n"
 "Language-Team: Spanish (Castilian) <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:909
+#: src/actorspritemanager.cpp:1005
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
@@ -114,202 +114,203 @@ msgstr "¡Error creando la carpeta de actualizaciones!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Comando desconocido."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "¡No puedes enviar susurros vacíos!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 "No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando la entrada del canal %s."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 msgid "Guild name is missing."
 msgstr "Falta el nombre del gremio."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "El mensaje cierra el chat."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 msgid "disregarded"
 msgstr "desatendido"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya %s!"
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Jugador %s exitosamente!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estaba ignorado!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 msgid "Player successfully erased!"
 msgstr "¡Jugador borrado con éxito!"
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 msgid "font cache size"
 msgstr "Cache de polizas"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 msgid "Created: "
 msgstr "Creado: "
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 msgid "Deleted: "
 msgstr "Eliminado: "
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión del servidor."
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Error de conexión"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las propuestas de intercambio"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las propuestas de intercambio"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -410,13 +411,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -515,7 +517,7 @@ msgid "Race:"
 msgstr "Race:"
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Crear"
 
@@ -572,7 +574,7 @@ msgstr "Cambiar e-mail"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Borrar"
 
@@ -657,12 +659,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores estan presentes."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando mensaje privado para %s: %s"
@@ -798,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -842,31 +844,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr "Conjuntos"
 
@@ -875,17 +877,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Tirar"
@@ -1151,7 +1153,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -1190,98 +1192,98 @@ msgstr "Quitárselo antes"
 msgid "Away outfit"
 msgstr "Fuera conjunto"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Intercambio@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Ataque@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 msgid "@@whisper|Whisper@@"
 msgstr "@@whisper|Susurrar@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 msgid "@@heal|Heal@@"
 msgstr "@@heal|Curar@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 msgid "@@friend|Be friend@@"
 msgstr "@@friend|Ser amigos@@"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Desatender@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorar@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 msgid "@@erase|Erase@@"
 msgstr "@@erase|Eliminar@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Dejar de Ignorar@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Ignorar completamente@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr "@@follow|Seguir@@"
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr "@@imitation|Imitación@@"
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 msgid "@@party|Invite to party@@"
 msgstr "@@party|Invitar al grupo@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 msgid "@@kick party|Kick from party@@"
 msgstr "@@kick party|Sacar del grupo@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@guild-kick|Sacar dela gremio@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr "@@guild-pos|Cambiar la posición en en gremio >@@"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 msgid "@@guild|Invite to guild@@"
 msgstr "@@guild|Invitar al gremio@@"
 
@@ -1294,21 +1296,21 @@ msgid "@@nuke|Nuke@@"
 msgstr "@@nuke|Borar@@"
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr "@@move|Mover@@"
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 msgid "@@undress|Undress@@"
 msgstr "@@undress|Desnudar@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr "@@buy|Comprar@@"
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 msgid "@@sell|Sell@@"
 msgstr "@@sell|Vender@@"
 
@@ -1316,173 +1318,213 @@ msgstr "@@sell|Vender@@"
 msgid "@@talk|Talk@@"
 msgstr "@@talk|Hablar@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Sacar@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+#, fuzzy
+msgid "@@remove attack|Remove from attack list@@"
+msgstr "@@remove map|Quitar@@"
+
+#: src/gui/popupmenu.cpp:265
+#, fuzzy
+msgid "@@remove attack|Remove from ignore list@@"
+msgstr "@@remove map|Quitar@@"
+
+#: src/gui/popupmenu.cpp:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|Ataque@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Agregar nombre al chat@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr "@@player_%u|%s >@@"
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 msgid "@@pickup|Pick up@@"
 msgstr "@@recojer|Recoger@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Agregar al chat@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr "@@rename map|Cambiar nombre@@"
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr "@@remove map|Quitar@@"
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr "@@load old outfits|Cargar los vestidos antiguos@@"
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr "Hechizos"
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr "@@load old spells|Cargar los hechizos antiguos@@"
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@edit spell|Editar hechizos@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr "@@chat close|Cerrar@@"
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr "No remover nombre"
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 msgid "Remove name"
 msgstr "Remover nombre"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr "@@leave party|Dejar@@"
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr "@@guild-pos-%d|%s@@"
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr "Nombre:"
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 msgid "Add to trade"
 msgstr "Agredar al intercambio"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr "Cargar atajos antiguos de artículos"
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr "Cargar atajos antiguos de soltar (drop)"
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr "Mostrar"
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "Por defecto"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Mover para arriba"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Mover para abajo"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Remover nombre"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr "Guardar estado"
@@ -1680,7 +1722,7 @@ msgid "Show chat colors list"
 msgstr "Mostrar lista de colores del chat"
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr "Editar"
 
@@ -1799,106 +1841,111 @@ msgstr "Por defecto"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflicto de teclas detectado."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Mostrar daño infligido a monstruos"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr "Eligir automáticamente sólo a los monstruos alcanzables"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 msgid "Highlight map portals"
 msgstr "Resaltar las puertas del mapa"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr "Resaltar el alcance de ataque del jugador"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr "Resaltar el alcanze de ataque de los monstruos"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr "Rodear las dianas del jugador"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 msgid "Cycle monster targets"
 msgstr "Rodear las dianas de los monstruos"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 msgid "Enable bot checker"
 msgstr "Habilitar el control de robot"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 msgid "Highlight floor items"
 msgstr "Resaltar los objetos sobre el suelo"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr "Programa de movimientos locos A"
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 msgid "Enable shop mode"
 msgstr "Habilitar la tienda"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr "Habilitar la proteción contra servidores defectuosos"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Enable server side attack"
 msgstr "Habilitar los ataques colaterales de servidor"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr "Corrección automatica de la posición"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr "Atacar mientras está en movimiento"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 msgid "Enable quick stats"
 msgstr "Habilitar estadísticas rápidas"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
 msgstr "Mostrar las partículas de efectos"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr "Aceptar peticiones de compra / venta"
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de energía del monstruo"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 msgid "Show own hp bar"
 msgstr "Mostrar la propia barra de energía"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr "Mostrar los mensajes de experiencia de trabajo"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr "Mostrar las ventanas emergentes de jugadores"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr "Mostrar minmapas extendidos"
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Habilitar pestaña de batalla"
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relación"
@@ -1991,8 +2038,8 @@ msgstr "Fuente de la ayuda"
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie el juego para que los cambios tengan efecto."
 
@@ -2142,8 +2189,8 @@ msgstr "Mostrar fondo"
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 msgid "Alt FPS limit: "
 msgstr "Limites alternativas FPS: "
 
@@ -2171,62 +2218,62 @@ msgstr "Detalle de partículas"
 msgid "Font size"
 msgstr "Tamaño de fuente"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 msgid "None"
 msgstr "Nada"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 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:535
+#: src/gui/setup_video.cpp:537
 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:546
+#: src/gui/setup_video.cpp:548
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:                "
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 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:751
+#: src/gui/setup_video.cpp:753
 msgid "Particle Effect Settings Changed."
 msgstr "Configuración del efecto de las partículas cambiado."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "Los cambios tendran efecto cuando se cambie de mapa."
 
@@ -2361,117 +2408,132 @@ msgstr "Salir del grupo?"
 msgid "Are you sure you want to leave party %s?"
 msgstr "Estás seguro de que quieres salir del grupo %s?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr "Navegación"
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Atacar"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Seleccionar Mundo"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Nombres Ignorados"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Crear clan"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 msgid "Create Party"
 msgstr "Crear grupo"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 msgid "Leave"
 msgstr "Dejar"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de   %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de  %s."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación a la guild de  %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Cancelada la invitación a la guild de %s."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando clan llamado %s."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 msgid "Guild Name"
 msgstr "Nombre del clan"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 msgid "Choose your guild's name."
 msgstr "Escoja el nombre de su clan."
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del clan, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado al clan %s."
 
-#: src/gui/socialwindow.cpp:1121
+#: src/gui/socialwindow.cpp:1269
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al clan"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 msgid "You have been invited you to join a party."
 msgstr "Fuiste invitado a un grupo."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, 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:1159
+#: src/gui/socialwindow.cpp:1307
 #, 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:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 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:1193
+#: src/gui/socialwindow.cpp:1341
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 msgid "Choose your party's name."
 msgstr "Escoja el nombre del grupo."
 
@@ -2954,27 +3016,27 @@ msgstr "Comando:"
 msgid "Mana:"
 msgstr "Maná:"
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 msgid "Target Type:"
 msgstr "Tipo de objetivo:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr "Ícono:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Magic level:"
 msgstr "Nivel de Magia:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr "Escuela de Magia:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 msgid "School level:"
 msgstr "Nivel de Escuela:"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr "Guardar"
 
@@ -3016,8 +3078,7 @@ msgid "Change"
 msgstr "Cambiar"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
@@ -3361,8 +3422,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jugador>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando para de ignorar al jugador si había sido ignorado."
 
 #: src/gui/windowmenu.cpp:62
@@ -3836,68 +3896,68 @@ msgstr ""
 "Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr "El artículo está muy lejos"
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 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:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 msgid "Imitation canceled"
 msgstr "Imitar cancelado"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 msgid "You see "
 msgstr "Ves "
 
@@ -4080,8 +4140,7 @@ msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
-"Parece que tu plan de romper las armas de tus enemigos con tu garganta "
-"falló!"
+"Parece que tu plan de romper las armas de tus enemigos con tu garganta falló!"
 
 #: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:112
 msgid "I guess this did not run too well."
@@ -4588,6 +4647,7 @@ msgid "M.Defense"
 msgstr "Defensa M."
 
 #: src/net/tmwa/generalhandler.cpp:259
+#, fuzzy
 msgid "% Accuracy"
 msgstr "% Presición"
 
@@ -4788,8 +4848,7 @@ msgstr "Comando: /item"
 
 #: src/net/tmwa/gui/partytab.cpp:100
 msgid "This command displays the party's current item sharing policy."
-msgstr ""
-"Este comando muestra el actual estado de compartir objetos en el grupo"
+msgstr "Este comando muestra el actual estado de compartir objetos en el grupo"
 
 #: src/net/tmwa/gui/partytab.cpp:105
 msgid "Command: /exp <policy>"
@@ -4884,8 +4943,8 @@ msgstr "Rechazado del servidor."
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Has sido baneado permanentemente del juego. Por favor contacta con el equipo"
-" GM."
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
+"GM."
 
 #: src/net/tmwa/loginhandler.cpp:178
 msgid "Client too old."
@@ -5048,13 +5107,11 @@ msgstr "Mensaje"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"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
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+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."
 
diff --git a/po/fr.po b/po/fr.po
index 582e15039..3efbc34e5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,22 +2,22 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+0300\n"
 "PO-Revision-Date: 2011-04-16 09:17+0000\n"
 "Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
 "Language-Team: French <>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/actorspritemanager.cpp:909
+#: src/actorspritemanager.cpp:1005
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
@@ -114,157 +114,157 @@ msgstr "Impossible de créer le dossier de mise à jour !"
 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"
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Il ne peut être créer une fenêtre de conversation avec le personnage \"%s\" "
-"! Elle existe déjà ou il s'agit de vous même."
+"Il ne peut être créer une fenêtre de conversation avec le personnage \"%s"
+"\" ! Elle existe déjà ou il s'agit de vous même."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Demande  de rejoindre le canal %s."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 msgid "Guild name is missing."
 msgstr "Le nom de la guilde est manquant."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr "Veuillez indiquer un nom."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "La touche enter ferme maintenant la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "Ce message ferme la conversation."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "La touche enter ferme la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Ce message ferme maintenant la conversation."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 msgid "friend"
 msgstr "ami"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 msgid "disregarded"
 msgstr "écarté"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 msgid "neutral"
 msgstr "neutre"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur  %s avec succès!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 msgid "Player could not be unignored!"
 msgstr "Le joueur n'a pas pu être à nouveau écouté !"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 msgid "Player successfully erased!"
 msgstr "Joueur éliminé avec succès !"
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 msgid "Player could not be erased!"
 msgstr "le joueur n'a pas pu être effacé !"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segondes"
 msgstr[1] "%d secondes"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 msgid "font cache size"
 msgstr "Cache de polices"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 msgid "Created: "
 msgstr "Créé : "
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 msgid "Deleted: "
 msgstr "Effacé : "
 
@@ -272,47 +272,47 @@ msgstr "Effacé : "
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", "
-"\"true\", \"false\", \"1\", \"0\"."
+"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
+"\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr "Informations"
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée en tant que"
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Impossible de sauvegarder la capture d'écran !"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargé"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -413,13 +413,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -518,7 +519,7 @@ msgid "Race:"
 msgstr "Race:"
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Créer"
 
@@ -575,7 +576,7 @@ msgstr "Modifier l'adresse e-mail"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -660,12 +661,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message privé envoyé à %s : %s"
@@ -801,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -845,31 +846,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Équiper"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Utiliser"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 msgid "Drop..."
 msgstr "Jeter..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Partager"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr "Tenues"
 
@@ -878,17 +879,17 @@ msgid "Weight:"
 msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Jeter"
@@ -1153,7 +1154,7 @@ msgstr "Soumettre"
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 msgid "Clear"
 msgstr "Effacer"
 
@@ -1192,98 +1193,98 @@ msgstr "Retirer d'abord l'équipement"
 msgid "Away outfit"
 msgstr "Équipement en absence"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Echange@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Attaque@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 msgid "@@whisper|Whisper@@"
 msgstr "@@whisper|Chuchoter@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 msgid "@@heal|Heal@@"
 msgstr "@@heal|Soigner@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 msgid "@@friend|Be friend@@"
 msgstr "@@friend|Être ami@@"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Ecarter@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorer@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 msgid "@@erase|Erase@@"
 msgstr "@@erase|Effacer@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Ne plus ignorer@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Complètement ignorer@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr "@@follow|Suivre@@"
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr "@@imitation|Imitation@@"
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 msgid "@@party|Invite to party@@"
 msgstr "@@party|Inviter dans le groupe@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 msgid "@@kick party|Kick from party@@"
 msgstr "@@kick party|renvoyer du groupe@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@guild-kick|renvoyer de la guilde@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr "@@guild-pos|Changer de position dans la guilde >@@"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 msgid "@@guild|Invite to guild@@"
 msgstr "@@guild|Inviter dans la guilde@@"
 
@@ -1296,21 +1297,21 @@ msgid "@@nuke|Nuke@@"
 msgstr "@@nuke|Atomiser@@"
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr "@@move|Bouger@@"
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 msgid "@@undress|Undress@@"
 msgstr "@@undress|Déshabiller@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr "@@buy|Acheter@@"
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 msgid "@@sell|Sell@@"
 msgstr "@@sell|Vendre@@"
 
@@ -1318,173 +1319,213 @@ msgstr "@@sell|Vendre@@"
 msgid "@@talk|Talk@@"
 msgstr "@@talk|Parler@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Renvoyer@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+#, fuzzy
+msgid "@@remove attack|Remove from attack list@@"
+msgstr "@@remove map|Retirer@@"
+
+#: src/gui/popupmenu.cpp:265
+#, fuzzy
+msgid "@@remove attack|Remove from ignore list@@"
+msgstr "@@remove map|Retirer@@"
+
+#: src/gui/popupmenu.cpp:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|Attaque@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Ajouter le nom dans la boite de dialogue@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuler@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr "@@player_%u|%s >@@"
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Ramasser@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Ajouter au dialogue@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr "Objet de carte"
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr "@@rename map|Renommer la carte@@"
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr "@@remove map|Retirer@@"
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr "@@load old outfits|Charger les anciennes tenues@@"
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr "Sortilèges"
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr "@@load old spells|Charger les anciens sorts@@"
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@edit spell|Editer le sort@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr "@@chat close|Fermer le dialogue@@"
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 msgid "Disable highlight"
 msgstr "Désactiver l'éclairage"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 msgid "Enable highlight"
 msgstr "Activer l'éclairage"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr "N'enlève pas le nom"
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 msgid "Remove name"
 msgstr "Enlève le nom"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr "@@leave party|Quitter le groupe@@"
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 msgid "Change guild position"
 msgstr "Changer la position de la Guilde"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr "@@guild-pos-%d|%s@@"
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte"
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr "Nom : "
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 msgid "Add to trade"
 msgstr "Ajouter dans l'échange"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 msgid "Store 10"
 msgstr "Entreposer 10"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 msgid "Store all"
 msgstr "Entreposer tout"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr "Charger les anciens raccourcis d'objets"
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr "Charger les anciens raccourcis de jets d'objets"
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr "Cacher"
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr "Montrer"
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "défaut"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Monter"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Descendre"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Enlève le nom"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr "Sauvegarder l'état"
@@ -1682,7 +1723,7 @@ msgid "Show chat colors list"
 msgstr "Montrer la liste des couleurs de chat"
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr "Editer"
 
@@ -1801,106 +1842,111 @@ msgstr "Par défaut"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr "Divers"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Montrer les dégâts infligés aux monstres"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr "Viser automatiquement  uniquement les monstres à portée de tir "
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 msgid "Highlight map portals"
 msgstr "Afficher les portails de changement de carte"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr "Afficher la portée d'attaque du joueur"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr "Afficher la portée d'attaque des monstres"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr "Mettre un cercle autour des joueurs ciblés pour l'attaque"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 msgid "Cycle monster targets"
 msgstr "Mettre un cercle autour des joueurs ciblés pour l'attaque "
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 msgid "Enable bot checker"
 msgstr "Activer le contrôle de robots"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 msgid "Highlight floor items"
 msgstr "Mettre en évidence les items sur le sol"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr "Programme A de mouvement de dingue"
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 msgid "Enable shop mode"
 msgstr "Activer le mode magasin"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr "Activer la protection contre les serveurs buggés"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 msgid "Enable debug log"
 msgstr "Activer le log de debug"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr "Auto-correction de la position"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr "Attaquer en bougeant"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 msgid "Enable quick stats"
 msgstr "Activer les statistiques instantanées"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
 msgstr "Montrer les effets de particules de déplacement"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr "Accepter les requêtes d'achat et de vente"
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr "Afficher la bar de vie des monstres"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 msgid "Show own hp bar"
 msgstr "Afficher votre propre barre de vie"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr "Afficher les messages d'expérience pour les points de compétences"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr "Afficher les pop-ups des joueurs"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr "Montrer les mini cartes étendues"
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Activer l'onglet de combat"
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relation"
@@ -1993,8 +2039,8 @@ msgstr "Taille de l'aide"
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
 
@@ -2144,8 +2190,8 @@ msgstr "Montrer le fond"
 msgid "FPS limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 msgid "Alt FPS limit: "
 msgstr "Alterner les limites FPS"
 
@@ -2173,67 +2219,67 @@ msgstr "Détail des particules"
 msgid "Font size"
 msgstr "Taille de police"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 msgid "None"
 msgstr "Rien"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 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:535
+#: src/gui/setup_video.cpp:537
 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:546
+#: src/gui/setup_video.cpp:548
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 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:559
+#: src/gui/setup_video.cpp:561
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 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:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution manuelle (Exemple : 1024x768)"
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr "Entrer la nouvelle résolution : "
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 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:751
+#: src/gui/setup_video.cpp:753
 msgid "Particle Effect Settings Changed."
 msgstr "Paramètres d'effet de particules modifiés."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
@@ -2368,120 +2414,134 @@ msgstr "Quitter le groupe ?"
 msgid "Are you sure you want to leave party %s?"
 msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Attaquer"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Sélection du monde"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Noms des ignorés"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Créer une Guilde"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 msgid "Create Party"
 msgstr "Créer un groupe"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 msgid "Leave"
 msgstr "Quitter"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 msgid "Choose your guild's name."
 msgstr "Choisissez le nom de la guilde."
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 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:1115
+#: src/gui/socialwindow.cpp:1263
 #, 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:1121
+#: src/gui/socialwindow.cpp:1269
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 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."
+"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, 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:1159
+#: src/gui/socialwindow.cpp:1307
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 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:1193
+#: src/gui/socialwindow.cpp:1341
 msgid "Party Name"
 msgstr "Nom du groupe"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 msgid "Choose your party's name."
 msgstr "Choisissez le nom du groupe."
 
@@ -2964,27 +3024,27 @@ msgstr "Commande :"
 msgid "Mana:"
 msgstr "Mana : "
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 msgid "Target Type:"
 msgstr "Type de cible"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr "Icône : "
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Magic level:"
 msgstr "Niveau de Magie :"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr "École de magie : "
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 msgid "School level:"
 msgstr "Niveau scolaire : "
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -3026,8 +3086,7 @@ msgid "Change"
 msgstr "Changer"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
@@ -3265,8 +3324,7 @@ msgstr "Commande : /users"
 
 #: src/gui/widgets/channeltab.cpp:65
 msgid "This command shows the users in this channel."
-msgstr ""
-"Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: src/gui/widgets/channeltab.cpp:69
 msgid "Command: /topic <message>"
@@ -3376,10 +3434,8 @@ msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:62
 msgid "BC"
@@ -3849,71 +3905,71 @@ msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 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."
+"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:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr "Vous avez été tué par "
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr "L'item est trop loin"
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr "Le regroupement est trop plein"
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 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:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 msgid "You see "
 msgstr "Vous voyez  "
 
@@ -4006,8 +4062,7 @@ msgstr ""
 
 #: src/main.cpp:69
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #: src/main.cpp:70
 msgid "     --safemode       : Start game in safe mode"
@@ -5086,18 +5141,16 @@ msgstr "Message"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"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."
+"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
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+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."
+"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
 #, c-format
diff --git a/po/hr.po b/po/hr.po
index c3adb403b..2fc42dbde 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-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+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:909
+#: src/actorspritemanager.cpp:1005
 #, fuzzy
 msgid "Visible on map"
 msgstr "Vidljiva imena"
@@ -127,15 +127,15 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Nepoznata naredba."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Ne mogu poslati prazan šapate!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -144,105 +144,105 @@ msgstr ""
 "Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to "
 "vi."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Zahtjev za pridruživanje kanalu %s."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Ime partije nedostaje."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Ime partije nedostaje."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "Poruka zatvara chat."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara chat."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 #, fuzzy
 msgid "friend"
 msgstr "Prijatelj"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 #, fuzzy
 msgid "disregarded"
 msgstr "Zanemareno"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 #, fuzzy
 msgid "neutral"
 msgstr "Neutralno"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Partija je uspješno kreirana."
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Partija je uspješno kreirana."
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Šapat nije mogao biti poslan, ignorirani ste od strane korisnika."
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -250,7 +250,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -258,7 +258,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -266,7 +266,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -274,7 +274,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -282,17 +282,17 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 #, fuzzy
 msgid "font cache size"
 msgstr "Veličina fonta"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 #, fuzzy
 msgid "Created: "
 msgstr "Stvori"
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 #, fuzzy
 msgid "Deleted: "
 msgstr "Obriši"
@@ -302,46 +302,46 @@ msgstr "Obriši"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Općenito"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Screenshot spremljen u ~/"
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Veza s poslužiteljem je bila izgubljena, program će se sada zatvoriti"
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Ne mogu učitati karte"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
@@ -444,13 +444,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -554,7 +555,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Stvori"
 
@@ -612,7 +613,7 @@ msgstr "Promijeni Email Adresu"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Obriši"
 
@@ -707,12 +708,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d igrača je prisutno."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -859,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Skini opremu"
 
@@ -906,32 +907,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Opremi"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Upotrijebi"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 #, fuzzy
 msgid "Drop..."
 msgstr "Ispusti"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Razdvoji"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr ""
 
@@ -940,17 +941,17 @@ msgid "Weight:"
 msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Ispusti"
@@ -1229,7 +1230,7 @@ msgstr "Dostavi"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 #, fuzzy
 msgid "Clear"
 msgstr "Zatvori"
@@ -1271,111 +1272,111 @@ msgstr "Skini opremu"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Razmijeni se s %s@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Napadni %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Upotrijebi@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Otkaži@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "@@friend|Be friend@@"
 msgstr "@@retrieve|Preuzmi@@"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Zanemari %s@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignoriraj %s@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Upotrijebi@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Prestani Ignorirati %s@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Potpuno ignoriraj %s@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Pozovite korisnike na partiju"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Šutni igrača@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Šutni igrača@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Pozovite korisnike na partiju"
@@ -1389,22 +1390,22 @@ msgid "@@nuke|Nuke@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Prestani Ignorirati %s@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Upotrijebi@@"
@@ -1414,195 +1415,233 @@ msgstr "@@use|Upotrijebi@@"
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Napadni %s@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Šutni igrača@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+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:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|Napadni %s@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Dodaj ime u chat@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Otkaži@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Pokupi %s@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Upotrijebi@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Istakni Karticu"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Istakni Karticu"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 #, fuzzy
 msgid "Remove name"
 msgstr "Zapamti korisničko ime"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 #, fuzzy
 msgid "Enable away"
 msgstr "Ne može se kupiti"
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "Disable away"
 msgstr "Omogući/Onemogući Trgovanje"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 #, fuzzy
 msgid "Change guild position"
 msgstr "Izmijeni"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 #, fuzzy
 msgid "Store 10"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 #, fuzzy
 msgid "Store half"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 #, fuzzy
 msgid "Store all"
 msgstr "Pohrani"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Preuzmi"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dudaj u chat@@"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "Zadano"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Pomakni Gore"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Pomakni Dolje"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Zapamti korisničko ime"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr ""
@@ -1809,7 +1848,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr ""
 
@@ -1935,116 +1974,121 @@ msgstr "Zadano"
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Istakni"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Istakni"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Omogući/Onemogući Trgovanje"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Ne može se kupiti"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Ne može se kupiti"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "kao čestica"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Prikaži ime"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr ""
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Ne može se kupiti"
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Odnos"
@@ -2144,8 +2188,8 @@ msgstr "Pomoć"
 msgid "Theme Changed"
 msgstr "Izmijeni"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
@@ -2305,8 +2349,8 @@ msgstr "Pozadina"
 msgid "FPS limit:"
 msgstr "Ograničenje sličica u sekundi"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "Ograničenje sličica u sekundi"
@@ -2336,64 +2380,64 @@ msgstr "Detalji Čestica"
 msgid "Font size"
 msgstr "Veličina fonta"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 #, fuzzy
 msgid "None"
 msgstr "Ne"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:537
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:548
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Prebacivanje u pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Promjena OpenGL-a"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Rezolucija Ekrana promijenjena"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:751
+#: src/gui/setup_video.cpp:753
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Postavke efekta čestica su promijenjene."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "Promjene će stupiti na snagu na promjeni karte."
 
@@ -2530,126 +2574,141 @@ msgstr ""
 msgid "Are you sure you want to leave party %s?"
 msgstr "Jeste li sigurni da želite odustati?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Napad"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Odaberite OK"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Ignorirano"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Formiraj Ceh"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 #, fuzzy
 msgid "Create Party"
 msgstr "Stvori Lika"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 #, fuzzy
 msgid "Invite"
 msgstr "Pozovi Korisnika"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 #, fuzzy
 msgid "Leave"
 msgstr "Veliko"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Prihvaćen poziv od %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odbijen poziv od %s."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Prihvaćen poziv od %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odbijen poziv od %s."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Pogreška pri ustanovljavanju ceha."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 #, fuzzy
 msgid "Guild Name"
 msgstr "Ceh"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Izaberite vaš server"
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, 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:1121
+#: src/gui/socialwindow.cpp:1269
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 #, 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:1151
+#: src/gui/socialwindow.cpp:1299
 #, 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:1159
+#: src/gui/socialwindow.cpp:1307
 #, 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:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1341
 #, fuzzy
 msgid "Party Name"
 msgstr "Partija"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Izaberite vaš server"
@@ -3149,30 +3208,30 @@ msgstr "Naredba: /who"
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 #, fuzzy
 msgid "Target Type:"
 msgstr "Ciljaj Igrača"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 #, fuzzy
 msgid "Magic level:"
 msgstr "Najviša razina"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 #, fuzzy
 msgid "School level:"
 msgstr "Prikaži ime"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr ""
 
@@ -4077,73 +4136,73 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Neuspješno korištenje predmeta."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Server je pun"
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Otkazano trgovanje."
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 #, fuzzy
 msgid "Imitation: "
 msgstr "Promijeni Email Adresu"
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Otkazano trgovanje."
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 #, fuzzy
 msgid "You see "
 msgstr "Vi dobijete %s."
diff --git a/po/hu.po b/po/hu.po
index c2a523589..6175e0f6e 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-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+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:909
+#: src/actorspritemanager.cpp:1005
 #, fuzzy
 msgid "Visible on map"
 msgstr "Látható nevek"
@@ -126,15 +126,15 @@ msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Ismeretlen parancs."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Nem küldhetsz üres üzenetet!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -142,150 +142,150 @@ msgid ""
 msgstr ""
 "Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "A csapatnév hiányzik."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "A csapatnév hiányzik."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "Az enter megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "Az üzenet bezárja a bevitelt."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "Az enter mostantól megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Az üzenet mostantól bezárja a bevitelt."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 #, fuzzy
 msgid "friend"
 msgstr "Barát"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 #, fuzzy
 msgid "disregarded"
 msgstr "Semmibevett"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 #, fuzzy
 msgid "neutral"
 msgstr "Semleges"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Csapat létrehozása sikeres."
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player already erased!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Csapat létrehozása sikeres."
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "A privát üzenet nem lett elküldve, mert le lettél tiltva."
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 #, fuzzy
 msgid "font cache size"
 msgstr "Betűméret"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 #, fuzzy
 msgid "Created: "
 msgstr "Létrehozás"
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 #, fuzzy
 msgid "Deleted: "
 msgstr "Törlés"
@@ -297,46 +297,46 @@ msgstr ""
 "Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", "
 "\"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Általános"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Képernyőt mentettük a ~/ helyre"
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "A kapcsolat megszakadt a szerverrel, a program most kilép."
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Kereskedési kérelmek elutasítása"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Nem lehet betölteni a térképet"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
@@ -439,13 +439,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -549,7 +550,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Létrehozás"
 
@@ -607,7 +608,7 @@ msgstr "Email cím módosírása"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Törlés"
 
@@ -703,12 +704,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d játékos van a közeledben."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
@@ -855,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Nem használ"
 
@@ -902,32 +903,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Használ"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Bevet"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 #, fuzzy
 msgid "Drop..."
 msgstr "Eldob"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Felosztás"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr ""
 
@@ -936,17 +937,17 @@ msgid "Weight:"
 msgstr "Súly:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Eldob"
@@ -1225,7 +1226,7 @@ msgstr "Küldés"
 msgid "NPC"
 msgstr "Gépjátékos"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 #, fuzzy
 msgid "Clear"
 msgstr "Szálfegyver"
@@ -1267,111 +1268,111 @@ msgstr "Nem használ"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Üzlet Te és %s között@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|%s megtámadása@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Bevet@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|mégse@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "@@friend|Be friend@@"
 msgstr "@@retrieve|Visszavesz@@"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Semmibe veszed %s-t@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|%s tiltása@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Bevet@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|%s tiltásának feloldása@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Teljesen letiltod %s-t@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Felhasználó csapatba hívása"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Játékos kirúgása@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Játékos kirúgása@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Felhasználó csapatba hívása"
@@ -1385,22 +1386,22 @@ msgid "@@nuke|Nuke@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|%s tiltásának feloldása@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Bevet@@"
@@ -1410,195 +1411,233 @@ msgstr "@@use|Bevet@@"
 msgid "@@talk|Talk@@"
 msgstr "@@attack|%s megtámadása@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Játékos kirúgása@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+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:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|%s megtámadása@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Neve hozzáadása a csevegéshez@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|mégse@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Vedd fel a(z) %s-t@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Bevet@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Kijelölt fül"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Kijelölt fül"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 #, fuzzy
 msgid "Remove name"
 msgstr "Felhasználónév megjegyzése"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 #, fuzzy
 msgid "Enable away"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "Disable away"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 #, fuzzy
 msgid "Change guild position"
 msgstr "Változtatás"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 #, fuzzy
 msgid "Store 10"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 #, fuzzy
 msgid "Store half"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 #, fuzzy
 msgid "Store all"
 msgstr "Raktároz"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Magához vesz"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Hozzáadás a chat-hez@@"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "Alapértelmezett"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Mozgás felfelé"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Mozgás lefelé"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Felhasználónév megjegyzése"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr ""
@@ -1805,7 +1844,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr ""
 
@@ -1931,116 +1970,121 @@ msgstr "Alapértelmezett"
 msgid "Key Conflict(s) Detected."
 msgstr "Billentyű ütközés van."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Kijelölt"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "A név mutatása"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Joystick engedélyezése"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Kijelölt"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Nem tudod megvenni."
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Joystick engedélyezése"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "Karakter felett"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "A név mutatása"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr ""
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Nem tudod megvenni."
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Kapcsolat"
@@ -2140,8 +2184,8 @@ msgstr "Súgó"
 msgid "Theme Changed"
 msgstr "Változtatás"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 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."
 
@@ -2301,8 +2345,8 @@ msgstr "Háttér"
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS Limit:"
@@ -2332,66 +2376,66 @@ msgstr "Effektek részletessége"
 msgid "Font size"
 msgstr "Betűméret"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 #, fuzzy
 msgid "None"
 msgstr "Nem"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 #, 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:535
+#: src/gui/setup_video.cpp:537
 #, 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:546
+#: src/gui/setup_video.cpp:548
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Átállás teljes képernyőre"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 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:559
+#: src/gui/setup_video.cpp:561
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "OpenGL átállítása"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 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:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "A képernyő felbontása megváltozott"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:751
+#: src/gui/setup_video.cpp:753
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Effektek beállítása megváltozott."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 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."
 
@@ -2528,126 +2572,141 @@ msgstr ""
 msgid "Are you sure you want to leave party %s?"
 msgstr "Biztos, hogy ki szeretne lépni?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Támadás"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Ok Kiválasztása"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Tiltott"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Klán létrehozása"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 #, fuzzy
 msgid "Create Party"
 msgstr "Karakter létrehozása"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 #, fuzzy
 msgid "Invite"
 msgstr "Felhasználó meghívása"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 #, fuzzy
 msgid "Leave"
 msgstr "Nagy"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Csapatba hívást elfogadta %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Csapatba hívást elutasította %s."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Csapatba hívást elfogadta %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Csapatba hívást elutasította %s."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Hiba a klán létrehozása közben."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 #, fuzzy
 msgid "Guild Name"
 msgstr "Klán"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Válassz szervert"
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, fuzzy, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:1121
+#: src/gui/socialwindow.cpp:1269
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s a csapatába hívott."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, fuzzy, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1307
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s a csapatába hívott."
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1312
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1341
 #, fuzzy
 msgid "Party Name"
 msgstr "Csapat"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Válassz szervert"
@@ -3147,30 +3206,30 @@ msgstr "Parancs: /who"
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 #, fuzzy
 msgid "Target Type:"
 msgstr "Játékost Kijelöl"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 #, fuzzy
 msgid "Magic level:"
 msgstr "Max. szint"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 #, fuzzy
 msgid "School level:"
 msgstr "A név mutatása"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr ""
 
@@ -4079,74 +4138,74 @@ msgid ""
 "strange behaviour."
 msgstr "Állítsd át, vagy a játék érdekesen fog viselkedni."
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Nem tudod felvenni a tárgyat."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 #, fuzzy
 msgid "Inventory is full."
 msgstr "A szerver tele van"
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 #, 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:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Az üzlet megszakadt."
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 #, fuzzy
 msgid "Imitation: "
 msgstr "Email cím módosírása"
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Az üzlet megszakadt."
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 #, fuzzy
 msgid "You see "
 msgstr "Kapott tárgy: %s."
diff --git a/po/it.po b/po/it.po
index a398c9964..19d6b8d1b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,22 +2,22 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+0300\n"
 "PO-Revision-Date: 2011-04-15 17:33+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Italian <>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:909
+#: src/actorspritemanager.cpp:1005
 msgid "Visible on map"
 msgstr ""
 
@@ -114,157 +114,157 @@ msgstr "Errore durante la creazione della directory degli aggiornamenti"
 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."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Impossibile inviare un sussurro vuoto!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
 "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
 "sei tu."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Richiesta per accedere al canale %s."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 msgid "Guild name is missing."
 msgstr "Manca il nome della gilda."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "Invio attiva/disattiva la conversazione."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "I messaggi chiudono la conversazione."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "\"Invio\" adesso attiva/disattiva la conversazione."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la conversazione."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 msgid "friend"
 msgstr "Amico"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 msgid "disregarded"
 msgstr "Disprezzato"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 msgid "neutral"
 msgstr "Neutro"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, c-format
 msgid "Player already %s!"
 msgstr "Giocatore già %s!"
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Giocatore %s con successo!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Player non può essere %s!"
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr "Il giocatore non era ignorato!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr "Giocatore non più ignorato!"
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 msgid "Player could not be unignored!"
 msgstr "Impossibile annullare l'ignoro!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 msgid "Player already erased!"
 msgstr "Il giocatore è già cancellato!"
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 msgid "Player successfully erased!"
 msgstr "Giocatore cancellato dal tuo schermo con successo!"
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 msgid "Player could not be erased!"
 msgstr "Il giocatore non può essere cancellato!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 msgid "Created: "
 msgstr ""
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 msgid "Deleted: "
 msgstr ""
 
@@ -272,46 +272,46 @@ msgstr ""
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" "
-"(falso), \"1\", \"0\"."
+"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
+"\" (falso), \"1\", \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Generale"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 msgid "Screenshot saved as "
 msgstr "Screenshot salvato come"
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio della schermata fallito!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è stata persa."
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Errore di rete"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 msgid "Could Not Load Map"
 msgstr "Impossibile caricare la mappa."
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
@@ -412,13 +412,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -517,7 +518,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Crea"
 
@@ -574,7 +575,7 @@ msgstr "Cambia email"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Elimina"
 
@@ -659,12 +660,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -800,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Togli"
 
@@ -844,31 +845,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Equipaggia"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Usa"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 msgid "Drop..."
 msgstr "Lascia..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Dividi"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr "Attrezzatura"
 
@@ -877,17 +878,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Magazzino"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Lascia"
@@ -1152,7 +1153,7 @@ msgstr "Invia"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 msgid "Clear"
 msgstr "Cancella"
 
@@ -1191,98 +1192,98 @@ msgstr "Rimuovi prima"
 msgid "Away outfit"
 msgstr "Away outfit"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Scambio@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Attacco@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 msgid "@@whisper|Whisper@@"
 msgstr "@@whisper|Sussurro@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 msgid "@@heal|Heal@@"
 msgstr "@@heal|Cura@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 msgid "@@friend|Be friend@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Disprezza@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignora@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 msgid "@@erase|Erase@@"
 msgstr "@@erase|Rimuovi dallo schermo@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Annulla ignoro@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Ignora completamente@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr "@@follow|Segui@@"
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr "@@imitation|Imita@@"
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 msgid "@@party|Invite to party@@"
 msgstr "@@party|Invita nel party@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 msgid "@@kick party|Kick from party@@"
 msgstr "@@kick party|Escludi dal party@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@guild-kick|Escludi dalla Gilda@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr "@@guild-pos|Cambia rango nella Gilda >@@"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 msgid "@@guild|Invite to guild@@"
 msgstr "@@guild|Invita nella Gilda@@"
 
@@ -1295,21 +1296,21 @@ msgid "@@nuke|Nuke@@"
 msgstr "@@nuke|Elimina completamente dallo schermo@@"
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr "@@move|Move@@"
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 msgid "@@undress|Undress@@"
 msgstr "@@undress|Svesti@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr "@@buy|Compra@@"
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 msgid "@@sell|Sell@@"
 msgstr "@@sell|Sell@@"
 
@@ -1317,173 +1318,210 @@ msgstr "@@sell|Sell@@"
 msgid "@@talk|Talk@@"
 msgstr "@@talk|Parla@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Escludi@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+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:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|Attacco@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Aggiungi il nome alla chat@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancella@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr "@@player_%u|%s >@@"
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Raccogli@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Aggiungi alla chat@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 msgid "@@edit spell|Edit spell@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "Predefinito"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Muoviti verso l'alto"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Muoviti verso il basso"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+msgid "Remove"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr ""
@@ -1679,7 +1717,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr ""
 
@@ -1798,106 +1836,110 @@ msgstr "Predefinito"
 msgid "Key Conflict(s) Detected."
 msgstr "Sono stati rilevati conflitti nei tasti."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr ""
 
+#: src/gui/setup_other.cpp:192
+msgid "Enable attack filter"
+msgstr ""
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relazione"
@@ -1990,8 +2032,8 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
@@ -2141,8 +2183,8 @@ msgstr ""
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -2170,59 +2212,59 @@ msgstr ""
 msgid "Font size"
 msgstr "Dimensione caratteri"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:537
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:548
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:751
+#: src/gui/setup_video.cpp:753
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "I cambi saranno effettuati al cambio della mappa."
 
@@ -2357,117 +2399,132 @@ msgstr ""
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Attacco"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Seleziona OK"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Ignora"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Crea una Gilda"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1121
+#: src/gui/socialwindow.cpp:1269
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1307
 #, 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:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1341
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2950,27 +3007,27 @@ msgstr ""
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr ""
 
@@ -3012,11 +3069,10 @@ msgid "Change"
 msgstr "Cambia"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla"
-" finestra."
+"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
+"finestra."
 
 #: src/gui/trade.cpp:359
 msgid "You don't have enough money."
@@ -3355,8 +3411,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <giocatore>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:62
@@ -3828,68 +3883,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1384
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 msgid "You see "
 msgstr ""
 
@@ -4768,8 +4823,7 @@ msgstr "Comando: /item <politica>"
 #: src/net/tmwa/gui/partytab.cpp:95
 msgid "This command changes the party's item sharing policy."
 msgstr ""
-"Questo comando modifica la politica di condivisione degli oggetti nel "
-"gruppo."
+"Questo comando modifica la politica di condivisione degli oggetti nel gruppo."
 
 #: src/net/tmwa/gui/partytab.cpp:96
 msgid ""
@@ -5035,15 +5089,13 @@ msgstr "Messaggio"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"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
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:448
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 053eb6ba5..71dab2b00 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-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+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:909
+#: src/actorspritemanager.cpp:1005
 msgid "Visible on map"
 msgstr ""
 
@@ -115,155 +115,155 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 msgid "Created: "
 msgstr ""
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 msgid "Deleted: "
 msgstr ""
 
@@ -272,43 +272,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -409,13 +409,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr ""
 
@@ -514,7 +515,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr ""
 
@@ -571,7 +572,7 @@ msgstr ""
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr ""
 
@@ -656,12 +657,12 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -797,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr ""
 
@@ -841,31 +842,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr ""
 
@@ -874,17 +875,17 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr ""
@@ -1149,7 +1150,7 @@ msgstr ""
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 msgid "Clear"
 msgstr ""
 
@@ -1188,98 +1189,98 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 msgid "@@trade|Trade@@"
 msgstr ""
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 msgid "@@attack|Attack@@"
 msgstr ""
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 msgid "@@whisper|Whisper@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 msgid "@@heal|Heal@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 msgid "@@friend|Be friend@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "@@disregard|Disregard@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 msgid "@@ignore|Ignore@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 msgid "@@erase|Erase@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 msgid "@@unignore|Unignore@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 msgid "@@ignore|Completely ignore@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 msgid "@@party|Invite to party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 msgid "@@kick party|Kick from party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 msgid "@@guild-kick|Kick from guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 msgid "@@guild|Invite to guild@@"
 msgstr ""
 
@@ -1292,21 +1293,21 @@ msgid "@@nuke|Nuke@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 msgid "@@undress|Undress@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 msgid "@@sell|Sell@@"
 msgstr ""
 
@@ -1314,173 +1315,206 @@ msgstr ""
 msgid "@@talk|Talk@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 msgid "@@admin-kick|Kick@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+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:270
+msgid "@@add attack|Add to attack list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 msgid "@@pickup|Pick up@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 msgid "@@edit spell|Edit spell@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+msgid "(default)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1622
+msgid "Move up"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1627
+msgid "Move down"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+msgid "Remove"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr ""
@@ -1676,7 +1710,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr ""
 
@@ -1795,106 +1829,110 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr ""
 
+#: src/gui/setup_other.cpp:192
+msgid "Enable attack filter"
+msgstr ""
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr ""
@@ -1987,8 +2025,8 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2138,8 +2176,8 @@ msgstr ""
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -2167,59 +2205,59 @@ msgstr ""
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:537
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:548
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:751
+#: src/gui/setup_video.cpp:753
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr ""
 
@@ -2354,117 +2392,129 @@ msgstr ""
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:823
+msgid "Selected mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:855
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1121
+#: src/gui/socialwindow.cpp:1269
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1307
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1312
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1341
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2947,27 +2997,27 @@ msgstr ""
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr ""
 
@@ -3819,68 +3869,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1384
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 msgid "You see "
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 57d0b7ce2..528e6e857 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-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+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:909
+#: src/actorspritemanager.cpp:1005
 #, fuzzy
 msgid "Visible on map"
 msgstr "Zichtbare namen"
@@ -126,164 +126,164 @@ msgstr "Fout bij het creëren van de update map!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 #, fuzzy
 msgid "friend"
 msgstr "Vriend"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 #, fuzzy
 msgid "neutral"
 msgstr "Neutraal"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Groep succesvol aangemaakt."
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Groep succesvol aangemaakt."
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Fluisterbericht kon niet verzonden worden, genegeerd door gebruiker."
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 #, fuzzy
 msgid "font cache size"
 msgstr "Lettergrootte"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 #, fuzzy
 msgid "Created: "
 msgstr "Aanmaken"
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 #, fuzzy
 msgid "Deleted: "
 msgstr "Verwijderen"
@@ -294,48 +294,48 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Screenshot opgeslagen naar ~/"
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr ""
 "De verbinding met de server is verloren gegaan, het programma zal nu "
 "afsluiten"
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Kan de map niet laden"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -438,13 +438,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -548,7 +549,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -606,7 +607,7 @@ msgstr "Emailadres wijzigen"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -702,12 +703,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d spelers zijn aanwezig."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -854,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -901,32 +902,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 #, fuzzy
 msgid "Drop..."
 msgstr "Neerleggen"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Splitsen"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr ""
 
@@ -935,17 +936,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1224,7 +1225,7 @@ msgstr "Indienen"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 #, fuzzy
 msgid "Clear"
 msgstr "Sluiten"
@@ -1266,105 +1267,105 @@ msgstr "Afdoen"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Handelen met %s@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|%s aanvallen@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Gebruiken@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Annuleren@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 msgid "@@friend|Be friend@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "@@disregard|Disregard@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 msgid "@@ignore|Ignore@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Gebruiken@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 msgid "@@unignore|Unignore@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "Voltooid"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Een gebruiker uitnodigen in de groep"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 msgid "@@kick party|Kick from party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 msgid "@@guild-kick|Kick from guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Een gebruiker uitnodigen in de groep"
@@ -1378,21 +1379,21 @@ msgid "@@nuke|Nuke@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 msgid "@@undress|Undress@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Gebruiken@@"
@@ -1402,191 +1403,229 @@ msgstr "@@use|Gebruiken@@"
 msgid "@@talk|Talk@@"
 msgstr "@@attack|%s aanvallen@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 msgid "@@admin-kick|Kick@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+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:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|%s aanvallen@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuleren@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|%s oppakken@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Gebruiken@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Tab Accentuering"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Tab Accentuering"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 #, fuzzy
 msgid "Remove name"
 msgstr "Onthoud Naam"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 #, fuzzy
 msgid "Enable away"
 msgstr "Kan niets kopen."
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "Disable away"
 msgstr "Handelen inschakelen/uitschakelen"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 #, fuzzy
 msgid "Change guild position"
 msgstr "Veranderen"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 #, fuzzy
 msgid "Add to trade"
 msgstr "Handel goedkeuren"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 #, fuzzy
 msgid "Store 10"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 #, fuzzy
 msgid "Store half"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 #, fuzzy
 msgid "Store all"
 msgstr "Opslaan"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Afhalen"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "Standaard"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Omhoog"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Omlaag"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Onthoud Naam"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr ""
@@ -1793,7 +1832,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr ""
 
@@ -1919,116 +1958,121 @@ msgstr "Standaard"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Accentueren"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Naam tonen"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Joystick activeren"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Accentueren"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Handelen inschakelen/uitschakelen"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Kan niets kopen."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Kan niets kopen."
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Joystick activeren"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "als deeltje"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Naam tonen"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr ""
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Kan niets kopen."
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relatie"
@@ -2128,8 +2172,8 @@ msgstr "Help"
 msgid "Theme Changed"
 msgstr "Veranderen"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -2289,8 +2333,8 @@ msgstr "Achtergrond"
 msgid "FPS limit:"
 msgstr "FPS limiet:"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS limiet:"
@@ -2320,66 +2364,66 @@ msgstr "Deeltjes details"
 msgid "Font size"
 msgstr "Lettergrootte"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 #, fuzzy
 msgid "None"
 msgstr "Nee"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 #, 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:535
+#: src/gui/setup_video.cpp:537
 #, 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:546
+#: src/gui/setup_video.cpp:548
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Overgaan naar volledig scherm"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Veranderen van OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 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:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Schermresolutie veranderd"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:751
+#: src/gui/setup_video.cpp:753
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Deeltjes effecten instellingen gewijzigd."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "Wijzigingen treden in werking bij het wisselen van map."
 
@@ -2516,126 +2560,141 @@ msgstr ""
 msgid "Are you sure you want to leave party %s?"
 msgstr "Weet u zeker dat u wilt afsluiten?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Aanvallen"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "OK selecteren"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Genegeerd"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 #, fuzzy
 msgid "Create Party"
 msgstr "Personage Aanmaken"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 #, fuzzy
 msgid "Invite"
 msgstr "Gebruiker uitnodigen"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 #, fuzzy
 msgid "Leave"
 msgstr "Groot"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging van %s aanvaard."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging van %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging van %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging van %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Fout bij het creëren van guild."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 #, fuzzy
 msgid "Guild Name"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Kies jouw server"
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, 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:1121
+#: src/gui/socialwindow.cpp:1269
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 #, 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:1151
+#: src/gui/socialwindow.cpp:1299
 #, 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:1159
+#: src/gui/socialwindow.cpp:1307
 #, 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:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1341
 #, fuzzy
 msgid "Party Name"
 msgstr "Groep"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Kies jouw server"
@@ -3135,30 +3194,30 @@ msgstr "Commando: /who"
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 #, fuzzy
 msgid "Target Type:"
 msgstr "Speler viseren"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 #, fuzzy
 msgid "Magic level:"
 msgstr "Maximum level"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 #, fuzzy
 msgid "School level:"
 msgstr "Naam tonen"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr ""
 
@@ -4070,74 +4129,74 @@ msgid ""
 "strange behaviour."
 msgstr "Los deze problemen op, of het spel kan raar gedrag vertonen."
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Kan het voorwerp niet oprapen."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Server is volzet"
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 #, 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:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Handel geannuleerd."
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 #, fuzzy
 msgid "Imitation: "
 msgstr "Emailadres wijzigen"
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Handel geannuleerd."
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 #, fuzzy
 msgid "You see "
 msgstr "Jij krijgt %s."
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 184871ddd..83f654890 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-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+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:909
+#: src/actorspritemanager.cpp:1005
 #, fuzzy
 msgid "Visible on map"
 msgstr "Zichtbare namen"
@@ -115,157 +115,157 @@ msgstr "Fout bij het creëren van de update map!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 #, fuzzy
 msgid "font cache size"
 msgstr "Lettergrootte"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 #, fuzzy
 msgid "Created: "
 msgstr "Aanmaken"
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 #, fuzzy
 msgid "Deleted: "
 msgstr "Verwijderen"
@@ -276,43 +276,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -413,13 +413,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -518,7 +519,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -575,7 +576,7 @@ msgstr "Wijzig Email"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -660,12 +661,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -801,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -845,31 +846,31 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Splitsen"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr "Kleren"
 
@@ -878,17 +879,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1153,7 +1154,7 @@ msgstr "Indienen"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 msgid "Clear"
 msgstr ""
 
@@ -1192,98 +1193,98 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 msgid "@@trade|Trade@@"
 msgstr ""
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 msgid "@@attack|Attack@@"
 msgstr ""
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 msgid "@@whisper|Whisper@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 msgid "@@heal|Heal@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 msgid "@@friend|Be friend@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "@@disregard|Disregard@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 msgid "@@ignore|Ignore@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 msgid "@@erase|Erase@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 msgid "@@unignore|Unignore@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 msgid "@@ignore|Completely ignore@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 msgid "@@party|Invite to party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 msgid "@@kick party|Kick from party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 msgid "@@guild-kick|Kick from guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 msgid "@@guild|Invite to guild@@"
 msgstr ""
 
@@ -1296,21 +1297,21 @@ msgid "@@nuke|Nuke@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 msgid "@@undress|Undress@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 msgid "@@sell|Sell@@"
 msgstr ""
 
@@ -1318,173 +1319,209 @@ msgstr ""
 msgid "@@talk|Talk@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 msgid "@@admin-kick|Kick@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+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:270
+msgid "@@add attack|Add to attack list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuleren@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 msgid "@@pickup|Pick up@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 msgid "@@edit spell|Edit spell@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "standaard"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Omhoog"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Omlaag"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+msgid "Remove"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr ""
@@ -1682,7 +1719,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr "Wijzig"
 
@@ -1801,106 +1838,110 @@ msgstr "Standaard"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Toon aangebrachte schade aan monsters"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr ""
 
+#: src/gui/setup_other.cpp:192
+msgid "Enable attack filter"
+msgstr ""
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relatie"
@@ -1993,8 +2034,8 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -2144,8 +2185,8 @@ msgstr ""
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -2173,61 +2214,61 @@ msgstr ""
 msgid "Font size"
 msgstr "Lettergrootte"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 msgid "None"
 msgstr "Geen"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:537
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:548
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 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:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 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:751
+#: src/gui/setup_video.cpp:753
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "Wijzigingen treden in werking bij het wisselen van map."
 
@@ -2362,117 +2403,132 @@ msgstr ""
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Aanvallen"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "OK selecteren"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Negeer"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1121
+#: src/gui/socialwindow.cpp:1269
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1307
 #, 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:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1341
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2955,27 +3011,27 @@ msgstr ""
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr ""
 
@@ -3835,70 +3891,70 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1384
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Handel geannuleerd."
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Handel geannuleerd."
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 msgid "You see "
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 605bb7bc8..661e18d97 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-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+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:909
+#: src/actorspritemanager.cpp:1005
 #, fuzzy
 msgid "Visible on map"
 msgstr "Widoczne imiona"
@@ -129,15 +129,15 @@ msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Nieznane polecenie."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Nie można wysłać pustych szeptów!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -146,105 +146,105 @@ msgstr ""
 "Nie można utworzyć zakładki szeptu dla ksywki \"%s\"! Już istnieje, albo to "
 "ty."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Prośba o dołączenie do kanału %s."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Brakuje nazwy grupy."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 #, fuzzy
 msgid "friend"
 msgstr "Przyjaciel"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 #, fuzzy
 msgid "disregarded"
 msgstr "Nielubiany"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 #, fuzzy
 msgid "neutral"
 msgstr "Neutralny"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Pomyślnie utworzono grupę."
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Pomyślnie utworzono grupę."
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -252,7 +252,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -260,7 +260,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -268,7 +268,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -276,7 +276,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -284,17 +284,17 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 #, fuzzy
 msgid "font cache size"
 msgstr "Rozmiar czcionki"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 #, fuzzy
 msgid "Created: "
 msgstr "Utwórz"
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 #, fuzzy
 msgid "Deleted: "
 msgstr "Usuń"
@@ -304,46 +304,46 @@ msgstr "Usuń"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Zrzut ekranu zapisany do ~/"
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało utracone, program zakończy pracę"
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Nie można załadować mapy"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Błąd podczas łądowania %s"
@@ -446,13 +446,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -556,7 +557,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Utwórz"
 
@@ -614,7 +615,7 @@ msgstr "Zmień adres Email"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Usuń"
 
@@ -710,12 +711,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d graczy jest obecnych."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -862,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Zdejmij"
 
@@ -908,32 +909,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Załóż"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Użyj"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 #, fuzzy
 msgid "Drop..."
 msgstr "Upuść"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Podziel"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr ""
 
@@ -942,17 +943,17 @@ msgid "Weight:"
 msgstr "Waga:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Przechowaj"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Upuść"
@@ -1230,7 +1231,7 @@ msgstr "Zatwierdź"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 #, fuzzy
 msgid "Clear"
 msgstr "Kij"
@@ -1272,111 +1273,111 @@ msgstr "Zdejmij"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Handel z %s@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Atakuj %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Użyj@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Anuluj@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "@@friend|Be friend@@"
 msgstr "@@retrieve|Pobierz@@"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Lekceważ %s@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignoruj %s@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Użyj@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Przestań Ignorować %s@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Kompletnie ignoruj %s@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Wykop gracza@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Wykop gracza@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Zaproś użytkownika do grupy"
@@ -1390,22 +1391,22 @@ msgid "@@nuke|Nuke@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Przestań Ignorować %s@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Użyj@@"
@@ -1415,195 +1416,233 @@ msgstr "@@use|Użyj@@"
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Atakuj %s@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Wykop gracza@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+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:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|Atakuj %s@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Dodaj imię do czatu@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Anuluj@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Podnieś %s@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Użyj@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Podświetlenie zakładki"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Podświetlenie zakładki"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 #, fuzzy
 msgid "Remove name"
 msgstr "Zapamiętaj użytkownika"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 #, fuzzy
 msgid "Enable away"
 msgstr "Nie można kupić."
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "Disable away"
 msgstr "Włącz/Wysłącz Handlowanie"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 #, fuzzy
 msgid "Change guild position"
 msgstr "Zmień"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 #, fuzzy
 msgid "Store 10"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 #, fuzzy
 msgid "Store half"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 #, fuzzy
 msgid "Store all"
 msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Pobierz"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "Domyślny"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Przesuń w górę"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Przesuń w dół"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Zapamiętaj użytkownika"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr ""
@@ -1810,7 +1849,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr ""
 
@@ -1936,116 +1975,121 @@ msgstr "Domyślny"
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Podświetlenie"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Włącz joystick"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Podświetlenie"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Włącz/Wysłącz Handlowanie"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Nie można kupić."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Nie można kupić."
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Włącz joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "jako cząsteczkę"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr ""
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Nie można kupić."
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relacja"
@@ -2145,8 +2189,8 @@ msgstr "Pomoc"
 msgid "Theme Changed"
 msgstr "Zmień"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie twojego klienta, aby mogły zajść zmiany."
 
@@ -2306,8 +2350,8 @@ msgstr "Tło"
 msgid "FPS limit:"
 msgstr "Limit FPS:"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "Limit FPS:"
@@ -2337,66 +2381,66 @@ msgstr "Detale cząsteczek"
 msgid "Font size"
 msgstr "Rozmiar czcionki"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 #, fuzzy
 msgid "None"
 msgstr "Nie"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 #, 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:535
+#: src/gui/setup_video.cpp:537
 #, 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:546
+#: src/gui/setup_video.cpp:548
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Przełączanie na pełen ekran"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Zmień na OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Zmieniono rozdzielczość ekranu"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:751
+#: src/gui/setup_video.cpp:753
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Zmieniono ustawienia ef. cząsteczek"
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "Efekty nastąpią po zmianie mapy."
 
@@ -2533,126 +2577,141 @@ msgstr ""
 msgid "Are you sure you want to leave party %s?"
 msgstr "Czy na pewno chcesz wyjść?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Atak"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Wybrano OK"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Ignorowany"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Utwórz Gildię"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 #, fuzzy
 msgid "Create Party"
 msgstr "Stwórz postać"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 #, fuzzy
 msgid "Invite"
 msgstr "Zaproś Użytkownika"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 #, fuzzy
 msgid "Leave"
 msgstr "Duża"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Zaakceptowano zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie od %s."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Błąd podczas tworzenia gildii."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 #, fuzzy
 msgid "Guild Name"
 msgstr "Gildia"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Wybierz twój serwer"
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 #, 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:1115
+#: src/gui/socialwindow.cpp:1263
 #, 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:1121
+#: src/gui/socialwindow.cpp:1269
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 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:1147
+#: src/gui/socialwindow.cpp:1295
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, 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:1159
+#: src/gui/socialwindow.cpp:1307
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił ciebie, byś dołączył do grupy."
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1341
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupa"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Wybierz twój serwer"
@@ -3152,30 +3211,30 @@ msgstr "Komenda: /who"
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 #, fuzzy
 msgid "Target Type:"
 msgstr "Namierz Gracza"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 #, fuzzy
 msgid "Magic level:"
 msgstr "Maks. poziom"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 #, fuzzy
 msgid "School level:"
 msgstr "Pokaż imię"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr ""
 
@@ -4083,74 +4142,74 @@ msgid ""
 "strange behaviour."
 msgstr "Rozwiąż je, albo granie może być utrudnione."
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Nie można podnieść przedmiotu."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Serwer jest pełny"
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 #, 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:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 #, fuzzy
 msgid "Follow canceled"
 msgstr " anulował"
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 #, fuzzy
 msgid "Imitation: "
 msgstr "Zmień adres Email"
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 #, fuzzy
 msgid "Imitation canceled"
 msgstr " anulował"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 #, fuzzy
 msgid "You see "
 msgstr "Otrzymujesz %s"
diff --git a/po/pt.po b/po/pt.po
index 75423cf70..a022499ec 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,22 +2,22 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+0300\n"
 "PO-Revision-Date: 2011-04-15 17:33+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese <>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:909
+#: src/actorspritemanager.cpp:1005
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
@@ -114,202 +114,203 @@ msgstr "Erro ao criar pasta de atualizações!"
 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."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
-" já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
+"já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 msgid "font cache size"
 msgstr "Tamanho do cache de fonte"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 msgid "Created: "
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 msgid "Deleted: "
 msgstr "Deletado:"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -410,13 +411,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -515,7 +517,7 @@ msgid "Race:"
 msgstr "Corrida:"
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Criar"
 
@@ -572,7 +574,7 @@ msgstr "Alterar email"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Excluir"
 
@@ -657,12 +659,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -798,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -842,31 +844,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -875,17 +877,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Descartar"
@@ -1150,7 +1152,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1189,98 +1191,98 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Negociar@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Atacar@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 msgid "@@whisper|Whisper@@"
 msgstr "@@whisper|Mensagem privada@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 msgid "@@heal|Heal@@"
 msgstr "@@heal|Curar@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 msgid "@@friend|Be friend@@"
 msgstr "@@friend|Ser Amigo@@"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Desconsiderar@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorar@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 msgid "@@erase|Erase@@"
 msgstr "@@erase|Apagar@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Parar de ignorar@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Ignorar completamente@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr "@@follow|Seguir@@"
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr "@@imitation|Imitar@@"
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 msgid "@@party|Invite to party@@"
 msgstr "@@party|Convidar para o grupo@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 msgid "@@kick party|Kick from party@@"
 msgstr "@@kick party|Expulsar do grupo@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@guild-kick|Expulsar da guilda@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr "@@guild-pos|Mudar posição da guilda >@@"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 msgid "@@guild|Invite to guild@@"
 msgstr "@@guild|Convidar para a guilda@@"
 
@@ -1293,21 +1295,21 @@ msgid "@@nuke|Nuke@@"
 msgstr "@@nuke|Tornar invisível@@"
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr "@@move|Mover@@"
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 msgid "@@undress|Undress@@"
 msgstr "@@undress|Remover@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr "@@buy|Comprar@@"
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 msgid "@@sell|Sell@@"
 msgstr "@@sell|Vender@@"
 
@@ -1315,173 +1317,213 @@ msgstr "@@sell|Vender@@"
 msgid "@@talk|Talk@@"
 msgstr "@@talk|Conversar@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Expulsar@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+#, fuzzy
+msgid "@@remove attack|Remove from attack list@@"
+msgstr "@@remove map|Remover do mapa@@"
+
+#: src/gui/popupmenu.cpp:265
+#, fuzzy
+msgid "@@remove attack|Remove from ignore list@@"
+msgstr "@@remove map|Remover do mapa@@"
+
+#: src/gui/popupmenu.cpp:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|Atacar@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Nome para o chat@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr "@@player_%u|%s >@@"
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Pegar@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Adicionar para o chat@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr "@@renomear mapa|Renomear@@"
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr "@@remove map|Remover do mapa@@"
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr "@@load old outfits|Carregar antigos roupas@@"
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr "@@load old spells|Carregar antigos feitiços@@"
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@edit spell|Editar feitiço@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr "@@chat close|Fechar@@"
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr "Não remover nome"
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 msgid "Remove name"
 msgstr "Remover nome"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr "@@leave party|Deixar grupo@@"
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr "@@guild-pos-%d|%s@@"
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr "Mostrar"
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "padrão"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Mover para Cima"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Mover para Baixo"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Remover nome"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr "Salvar Estado"
@@ -1678,7 +1720,7 @@ msgid "Show chat colors list"
 msgstr "Mostrar lista de cores do chat"
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr "Editar"
 
@@ -1797,106 +1839,111 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr "Habilitar proteção contra servidores com bugs"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr "Mostrar menssagens de job exp"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Habilitar aba de batalha"
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relação"
@@ -1989,8 +2036,8 @@ msgstr "Fonte de ajuda"
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2140,8 +2187,8 @@ msgstr "Mostrar imagem de fundo"
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
@@ -2169,63 +2216,63 @@ msgstr "Detalhe de partículas"
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 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:535
+#: src/gui/setup_video.cpp:537
 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:546
+#: src/gui/setup_video.cpp:548
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 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:751
+#: src/gui/setup_video.cpp:753
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -2360,117 +2407,132 @@ msgstr "Sair do grupo?"
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Atacar"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Selecionar Mundo"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Nome de Ignorados"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 msgid "Invite"
 msgstr "Convidar"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, 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:1121
+#: src/gui/socialwindow.cpp:1269
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, 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:1159
+#: src/gui/socialwindow.cpp:1307
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 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:1193
+#: src/gui/socialwindow.cpp:1341
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -2953,27 +3015,27 @@ msgstr "Comando:"
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr "Salvar"
 
@@ -3015,8 +3077,7 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3356,8 +3417,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -3832,68 +3892,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr "Este item está muito longe."
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 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:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 msgid "You see "
 msgstr "Você vê "
 
@@ -4796,8 +4856,7 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:106
 msgid "This command changes the party's experience sharing policy."
-msgstr ""
-"Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:108
 msgid ""
@@ -4814,8 +4873,7 @@ msgstr "Comando: /exp"
 #: src/net/tmwa/gui/partytab.cpp:112
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do "
-"grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:146 src/net/tmwa/partyhandler.cpp:287
 msgid "Item sharing enabled."
@@ -5049,15 +5107,13 @@ msgstr "Mensagem"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"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
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+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."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7f97dfa21..dd979d4ca 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,22 +2,22 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+0300\n"
 "PO-Revision-Date: 2011-04-15 17:33+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazilian) <>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/actorspritemanager.cpp:909
+#: src/actorspritemanager.cpp:1005
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
@@ -114,202 +114,203 @@ msgstr "Erro ao criar pasta de atualizações!"
 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."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
-" já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
+"já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 msgid "font cache size"
 msgstr "Tamanho de fonte Cache"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 msgid "Created: "
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 msgid "Deleted: "
 msgstr "Deletado:"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -410,13 +411,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -515,7 +517,7 @@ msgid "Race:"
 msgstr "Corrida:"
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Criar"
 
@@ -572,7 +574,7 @@ msgstr "Alterar email"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Excluir"
 
@@ -657,12 +659,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -798,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -842,31 +844,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -875,17 +877,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Descartar"
@@ -1150,7 +1152,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1189,98 +1191,98 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas de ocupado"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Negociar@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Atacar@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 msgid "@@whisper|Whisper@@"
 msgstr "@@whisper|Mensagem privada@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 msgid "@@heal|Heal@@"
 msgstr "@@heal|Curar@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 msgid "@@friend|Be friend@@"
 msgstr "@@friend|Ser Amigo@@"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Desconsiderar@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorar@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 msgid "@@erase|Erase@@"
 msgstr "@@erase|Apagar@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Parar de ignorar@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Ignorar completamente@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr "@@follow|Seguir@@"
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr "@@imitation|Imitar@@"
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 msgid "@@party|Invite to party@@"
 msgstr "@@party|Convidar para o grupo@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 msgid "@@kick party|Kick from party@@"
 msgstr "@@kick party|Expulsar do grupo@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@guild-kick|Expulsar da guilda@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr "@@guild-pos|Mudar posição da guilda >@@"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 msgid "@@guild|Invite to guild@@"
 msgstr "@@guild|Convidar para a guilda@@"
 
@@ -1293,21 +1295,21 @@ msgid "@@nuke|Nuke@@"
 msgstr "@@nuke|Tornar invisível@@"
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr "@@move|Mover@@"
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 msgid "@@undress|Undress@@"
 msgstr "@@undress|Remover@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr "@@buy|Comprar@@"
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 msgid "@@sell|Sell@@"
 msgstr "@@sell|Vender@@"
 
@@ -1315,173 +1317,213 @@ msgstr "@@sell|Vender@@"
 msgid "@@talk|Talk@@"
 msgstr "@@talk|Conversar@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Expulsar@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+#, fuzzy
+msgid "@@remove attack|Remove from attack list@@"
+msgstr "@@remove map|Remover do mapa@@"
+
+#: src/gui/popupmenu.cpp:265
+#, fuzzy
+msgid "@@remove attack|Remove from ignore list@@"
+msgstr "@@remove map|Remover do mapa@@"
+
+#: src/gui/popupmenu.cpp:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|Atacar@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Nome para o chat@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr "@@player_%u|%s >@@"
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Pegar@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Adicionar para o chat@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr "@@renomear mapa|Renomear@@"
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr "@@remove map|Remover do mapa@@"
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr "@@load old outfits|Carregar antigos roupas@@"
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr "@@load old spells|Carregar antigos feitiços@@"
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@edit spell|Editar feitiço@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr "@@chat close|Fechar@@"
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr "Não remover o nome"
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 msgid "Remove name"
 msgstr "Remover o nome"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr "@@leave party|Deixar grupo@@"
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr "@@guild-pos-%d|%s@@"
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr "Nome:                    "
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr "Mostrar"
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "padrão"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Mover para Cima"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Mover para Baixo"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Remover o nome"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr "Salvar Estado"
@@ -1678,7 +1720,7 @@ msgid "Show chat colors list"
 msgstr "Mostrar lista de cores do chat"
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr "Editar"
 
@@ -1797,106 +1839,111 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr "Habilitar proteção contra servidores com bugs"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr "Mostrar menssagens de job exp"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Habilitar aba de batalha"
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relação"
@@ -1989,8 +2036,8 @@ msgstr "Fonte de ajuda"
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2140,8 +2187,8 @@ msgstr "Mostrar imagem de fundo"
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
@@ -2169,63 +2216,63 @@ msgstr "Detalhe de partículas"
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 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:535
+#: src/gui/setup_video.cpp:537
 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:546
+#: src/gui/setup_video.cpp:548
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 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:751
+#: src/gui/setup_video.cpp:753
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -2360,117 +2407,132 @@ msgstr "Sair do grupo?"
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Atacar"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Selecionar Mundo"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Nome de Ignorados"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 msgid "Invite"
 msgstr "Convidar"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, 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:1121
+#: src/gui/socialwindow.cpp:1269
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, 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:1159
+#: src/gui/socialwindow.cpp:1307
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 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:1193
+#: src/gui/socialwindow.cpp:1341
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -2953,27 +3015,27 @@ msgstr "Comando:"
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr "Salvar"
 
@@ -3015,8 +3077,7 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3356,8 +3417,7 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -3832,68 +3892,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr "Este item está muito longe."
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 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:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 msgid "You see "
 msgstr "Você vê "
 
@@ -4796,8 +4856,7 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:106
 msgid "This command changes the party's experience sharing policy."
-msgstr ""
-"Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:108
 msgid ""
@@ -4814,8 +4873,7 @@ msgstr "Comando: /exp"
 #: src/net/tmwa/gui/partytab.cpp:112
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do "
-"grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:146 src/net/tmwa/partyhandler.cpp:287
 msgid "Item sharing enabled."
@@ -5049,15 +5107,13 @@ msgstr "Mensagem"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"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
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+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."
diff --git a/po/ru.po b/po/ru.po
index 788d5b0e8..cfefd8657 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,22 +2,23 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-04-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+0300\n"
 "PO-Revision-Date: 2011-04-15 17:35+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian <>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"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"
+"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:909
+#: src/actorspritemanager.cpp:1005
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
@@ -114,114 +115,114 @@ msgstr "Ошибка создания директории для обновле
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Неизвестная команда."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Нельзя отправлять пустые сообщения!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
-" you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
-" уже создана, или этот игрок вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
+"уже создана, или этот игрок вы сами."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Запрос на присоединение к каналу %s."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Не указано название группы"
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 msgid "Guild name is missing."
 msgstr "Не задано имя гильдии."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr "Пожалуйста укажите имя"
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "Enter переключает вас на окно чата."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 msgid "friend"
 msgstr "друг"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 msgid "neutral"
 msgstr "нейтральный"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорируется!"
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из списка игнорирования!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 msgid "Player successfully erased!"
 msgstr "Игрок удален!"
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -229,7 +230,7 @@ msgstr[0] "%d неделя"
 msgstr[1] "%d недели"
 msgstr[2] "%d недель"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -237,7 +238,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -245,7 +246,7 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -253,7 +254,7 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -261,60 +262,62 @@ msgstr[0] "%d секунда"
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 msgid "font cache size"
 msgstr "размер кеша шрифта"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 msgid "Created: "
 msgstr "Создано: "
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 msgid "Deleted: "
 msgstr "Удалено: "
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
+msgstr ""
+"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
+"\"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -415,13 +418,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -520,7 +524,7 @@ msgid "Race:"
 msgstr "Расса:"
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Создать"
 
@@ -577,7 +581,7 @@ msgstr "Сменить адрес E-mail"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Удалить"
 
@@ -662,12 +666,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -803,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Снять"
 
@@ -847,31 +851,31 @@ msgid "id"
 msgstr "ид"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Надеть"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Использовать"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Разделить"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr "Наряды"
 
@@ -880,17 +884,17 @@ msgid "Weight:"
 msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Бросить"
@@ -1155,7 +1159,7 @@ msgstr "Применить"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 msgid "Clear"
 msgstr "Очистить"
 
@@ -1194,98 +1198,98 @@ msgstr "Сначала снять"
 msgid "Away outfit"
 msgstr "наряд отсутствия"
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Торговать@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Атаковать@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 msgid "@@whisper|Whisper@@"
 msgstr "@@whisper|Шептать@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 msgid "@@heal|Heal@@"
 msgstr "@@heal|Лечить@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 msgid "@@friend|Be friend@@"
 msgstr "@@friend|Подружиться@@"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Пренебреч@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 msgid "@@ignore|Ignore@@"
 msgstr "@@unignore|Игнорировать@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 msgid "@@erase|Erase@@"
 msgstr "@@erase|Стереть@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Не игнорировать@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Полностью игнорировать@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr "@@follow|Следовать@@"
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr "@@imitation|Имитация@@"
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 msgid "@@party|Invite to party@@"
 msgstr "@@party|Пригласить в группу@@"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 msgid "@@kick party|Kick from party@@"
 msgstr "@@kick party|Вышвырнуть из группы@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@guild-kick|Выкинуть из гильдии@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr "@@guild-pos|Сменить статус в гильдии >@@"
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 msgid "@@guild|Invite to guild@@"
 msgstr "@@guild|Пригласить в гильдию@@"
 
@@ -1298,21 +1302,21 @@ msgid "@@nuke|Nuke@@"
 msgstr "@@nuke|Уничтожить@@"
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr "@@move|Двигаться@@"
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 msgid "@@undress|Undress@@"
 msgstr "@@undress|Раздеть@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr "@@buy|Купить@@"
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 msgid "@@sell|Sell@@"
 msgstr "@@sell|Продать@@"
 
@@ -1320,173 +1324,213 @@ msgstr "@@sell|Продать@@"
 msgid "@@talk|Talk@@"
 msgstr "@@talk|Говорить@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Вышвырнуть игрока@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+#, fuzzy
+msgid "@@remove attack|Remove from attack list@@"
+msgstr "@@remove map|Удалить@@"
+
+#: src/gui/popupmenu.cpp:265
+#, fuzzy
+msgid "@@remove attack|Remove from ignore list@@"
+msgstr "@@remove map|Удалить@@"
+
+#: src/gui/popupmenu.cpp:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|Атаковать@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Добавить имя в чат@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Отмена@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr "@@player_%u|%s >@@"
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Поднять@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Добавить в чат@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr "Элмент карты"
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr "@@rename map|Переименовать@@"
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr "@@remove map|Удалить@@"
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr "@@load old outfits|Загрузить старые наряды@@"
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr "Заклинания"
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr "@@load old spells|Загрузить старые заклинания@@"
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@edit spell|Изменить заклинание@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr "@@chat close|Закрыть@@"
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr "Не скрывать имя"
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 msgid "Remove name"
 msgstr "Скрывать имя"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 msgid "Enable away"
 msgstr "Рарешить режим отошел"
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 msgid "Disable away"
 msgstr "Запретить режим отошел"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr "@@leave party|Покинуть@@"
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr "@@guild-pos-%d|%s@@"
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте"
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr "Имя:                    "
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 msgid "Add to trade"
 msgstr "Добавить к торговли"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 msgid "Add to trade 10"
 msgstr "Добавить к торговле 10"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 msgid "Add to trade half"
 msgstr "Добавить к торговле половину"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 msgid "Store 10"
 msgstr "Сохранить 10"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 msgid "Store half"
 msgstr "Сохранить половину"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 msgid "Store all"
 msgstr "Сохранить все"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 msgid "Retrieve half"
 msgstr "Получить половину"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 msgid "Retrieve all"
 msgstr "Получить все"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr "Загрузить старые горячие клавиши предметов"
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr "Загрузить старые данные"
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr "Спрятать"
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr "Показать"
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "По умолчанию"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Движение вверх"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Движение вниз"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Скрывать имя"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr "Сохранить состояние"
@@ -1683,7 +1727,7 @@ msgid "Show chat colors list"
 msgstr "Показать список цветов чата"
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr "Изменить"
 
@@ -1802,106 +1846,111 @@ msgstr "По умолчанию"
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружен(ы) конфликт(ы) клавиш!"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr "Разное"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr "Показ. повр. нанесенные монстрам"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr "Автоприцел по доступным монстрам"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 msgid "Highlight map portals"
 msgstr "Подсветка точек перехода на карте"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr "Подсветка радиуса атаки игрока"
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr "Подсветка радиуса атаки монстров"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr "Прокручивать прицел по игрокам"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 msgid "Cycle monster targets"
 msgstr "Прокручивать прицел по монстрам"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 msgid "Highlight floor items"
 msgstr "Подсветка предметов на полу"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr "Программа для сумасшедших движений A"
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr "Включить защиту от сбойных серверов"
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr "Авто. исправ. позиции"
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr "Атаковать в движении"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 msgid "Enable quick stats"
 msgstr "Включить быструю смену статов"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 msgid "Show warps particles"
 msgstr "Показывать анимацию порталов"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr "Принимать запросы купить/продать"
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr "Показывать жизнь мобов"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 msgid "Show own hp bar"
 msgstr "Показывать свою жизнь"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr "Показывать опыт работы."
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr "Показ. всплыв. сообщения игроков"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr "Показывать расширенные миникарты"
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Включить вкладку боя"
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Отношение"
@@ -1994,8 +2043,8 @@ msgstr "Шрифт помощи"
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу."
 
@@ -2145,8 +2194,8 @@ msgstr "Показать фон"
 msgid "FPS limit:"
 msgstr "Ограничить кадр/с:"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 msgid "Alt FPS limit: "
 msgstr "Альтер. ограничить кадр/с: "
 
@@ -2174,65 +2223,65 @@ msgstr "Детализация частиц"
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 msgid "None"
 msgstr "Нет"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
-" удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
+"удалось!"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:537
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
 "также не удалось!"
 
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:548
 msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr "Новое разрешение:                   "
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 msgid "Screen Resolution Changed"
 msgstr "Разрешение экрана изменено"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
 "разрешении"
 
-#: src/gui/setup_video.cpp:751
+#: src/gui/setup_video.cpp:753
 msgid "Particle Effect Settings Changed."
 msgstr "Настройки эффектов частиц изменены."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "Изменения вступят в силу после загрузки новой карты."
 
@@ -2367,117 +2416,132 @@ msgstr "Покинуть группу?"
 msgid "Are you sure you want to leave party %s?"
 msgstr "Вы действительно хотите покинуть группу %s?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr "Нав"
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Атака"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Выбрать Сервер"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Игнорируемые имена"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Создать Гильдию"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 msgid "Create Party"
 msgstr "Создать группу"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr "Общество"
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 msgid "Invite"
 msgstr "Пригласить"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 msgid "Leave"
 msgstr "Покинуть"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принято приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 msgid "Guild Name"
 msgstr "Имя гильдии"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 msgid "Choose your guild's name."
 msgstr "Выберите имя для гильдии."
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в гильдию, но оно не первое."
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к гильдии %s."
 
-#: src/gui/socialwindow.cpp:1121
+#: src/gui/socialwindow.cpp:1269
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в гильдию"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но оно не порвое."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 msgid "You have been invited you to join a party."
 msgstr "Вас приглашают в группу."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас приглашают присоединиться к группе %s."
 
-#: src/gui/socialwindow.cpp:1159
+#: src/gui/socialwindow.cpp:1307
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает вас к себе в группу."
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1312
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 msgid "Cannot create party. You are already in a party"
 msgstr "Не удалось создать группу. Вы уже состоите в другой."
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1341
 msgid "Party Name"
 msgstr "Имя группы"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
@@ -2960,27 +3024,27 @@ msgstr "Команда:"
 msgid "Mana:"
 msgstr "Мана:"
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 msgid "Target Type:"
 msgstr "Тип цели:"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr "Картинка:"
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Magic level:"
 msgstr "Уровень Магии:"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr "Школа Магии:"
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 msgid "School level:"
 msgstr "Уровень школы:"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr "Сохранить"
 
@@ -3022,8 +3086,7 @@ msgid "Change"
 msgstr "Сменить"
 
 #: src/gui/trade.cpp:314
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
@@ -3358,16 +3421,15 @@ msgstr "Команда: /ignore"
 #: src/gui/widgets/whispertab.cpp:123
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
-" отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
+"отношений с ним."
 
 #: src/gui/widgets/whispertab.cpp:128
 msgid "Command: /unignore <player>"
 msgstr "Команда: /unignore <игрок>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid ""
-"This command stops ignoring the other player if they are being ignored."
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
 #: src/gui/windowmenu.cpp:62
@@ -3841,41 +3903,41 @@ msgstr ""
 "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
 "вести."
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr "Вы были убиты "
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый"
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1384
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -3883,27 +3945,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 msgid "You see "
 msgstr "Вы видите "
 
@@ -4430,8 +4492,7 @@ msgstr "Неизвестная ошибка сервера чата."
 
 #: src/net/tmwa/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
 #: src/net/tmwa/charserverhandler.cpp:176 src/net/tmwa/loginhandler.cpp:194
 msgid "Wrong name."
@@ -4789,7 +4850,8 @@ msgstr "Команда изменяет политику разделения п
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr "<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
+msgstr ""
+"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
 
 #: src/net/tmwa/gui/partytab.cpp:99
 msgid "Command: /item"
@@ -4812,8 +4874,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий"
-" опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
+"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий "
+"опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
 
 #: src/net/tmwa/gui/partytab.cpp:111
 msgid "Command: /exp"
@@ -5052,15 +5114,13 @@ msgstr "Сообщение"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Вы несете груз больший, чем половина вашей грузоподъемности. Не удалось "
 "восстановить здоровье."
 
 #: src/net/tmwa/playerhandler.cpp:343
-msgid ""
-"You are carrying less than half your weight. You are can regain health."
+msgid "You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Вы несете груз меньше, чем половина вашей грузоподъемности. Вы можете "
 "восстановить здоровье."
diff --git a/po/sv.po b/po/sv.po
index 54937f9db..30bb956e7 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-15 20:28+0300\n"
+"POT-Creation-Date: 2011-04-22 00:47+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:909
+#: src/actorspritemanager.cpp:1005
 #, fuzzy
 msgid "Visible on map"
 msgstr "Synliga namn"
@@ -126,15 +126,15 @@ msgstr "Kunde inte skapa katalog för uppdateringar!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:285
 msgid "Unknown command."
 msgstr "Okänt kommando."
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:385
 msgid "Cannot send empty whispers!"
 msgstr "Behöver en text att viska!"
 
-#: src/commandhandler.cpp:380
+#: src/commandhandler.cpp:393
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -143,150 +143,150 @@ msgstr ""
 "Kan inte skapa viskningsflik för smeknamnet \"%s\"! Antingen existerar "
 "fliken redan eller så försöker du viska till dig själv."
 
-#: src/commandhandler.cpp:400
+#: src/commandhandler.cpp:413
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Skickar förfrågan att gå in i chattkanalen %s."
 
-#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:429 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Du måste ange gruppens namn."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:440
 #, fuzzy
 msgid "Guild name is missing."
 msgstr "Du måste ange gruppens namn."
 
-#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
-#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+#: src/commandhandler.cpp:453 src/commandhandler.cpp:560
+#: src/commandhandler.cpp:601 src/commandhandler.cpp:631
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Return toggles chat."
 msgstr "Retur visar/döljer chattfönstret."
 
-#: src/commandhandler.cpp:481
+#: src/commandhandler.cpp:494
 msgid "Message closes chat."
 msgstr "Meddelande stänger chattfönstret."
 
-#: src/commandhandler.cpp:492
+#: src/commandhandler.cpp:505
 msgid "Return now toggles chat."
 msgstr "Retur växlar nu chattfönstrets synlighet."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:511
 msgid "Message now closes chat."
 msgstr "Meddelanden stänger nu chattfönstret."
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:539
 #, fuzzy
 msgid "friend"
 msgstr "Vän"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:544
 #, fuzzy
 msgid "disregarded"
 msgstr "Förbisedd"
 
-#: src/commandhandler.cpp:536
+#: src/commandhandler.cpp:549
 #, fuzzy
 msgid "neutral"
 msgstr "Neutral"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
 #, fuzzy, c-format
 msgid "Player already %s!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/commandhandler.cpp:569
+#: src/commandhandler.cpp:582
 #, fuzzy, c-format
 msgid "Player successfully %s!"
 msgstr "Grupp skapad."
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:590
 #, fuzzy, c-format
 msgid "Player could not be %s!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/commandhandler.cpp:599
+#: src/commandhandler.cpp:612
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:608
+#: src/commandhandler.cpp:621
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:638
 #, fuzzy
 msgid "Player already erased!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/commandhandler.cpp:636
+#: src/commandhandler.cpp:649
 #, fuzzy
 msgid "Player successfully erased!"
 msgstr "Grupp skapad."
 
-#: src/commandhandler.cpp:638
+#: src/commandhandler.cpp:651
 #, fuzzy
 msgid "Player could not be erased!"
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:944 src/commandhandler.cpp:990
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:954
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:963
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:971
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:979
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:987
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1046
 #, fuzzy
 msgid "font cache size"
 msgstr "Typsnittsgrad"
 
-#: src/commandhandler.cpp:1008
+#: src/commandhandler.cpp:1059
 #, fuzzy
 msgid "Created: "
 msgstr "Skapa"
 
-#: src/commandhandler.cpp:1009
+#: src/commandhandler.cpp:1060
 #, fuzzy
 msgid "Deleted: "
 msgstr "Ta bort"
@@ -296,47 +296,47 @@ msgstr "Ta bort"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Alternativ till /%s är ”yes”, ”no”, ”true”, ”false”, ”1”, ”0”."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
+#: src/game.cpp:229 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "Allmänt"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+#: src/game.cpp:233 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:444
+#: src/game.cpp:445
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Skärmbild sparades till ~/"
 
-#: src/game.cpp:452
+#: src/game.cpp:453
 msgid "Saving screenshot failed!"
 msgstr "Kunde inte spara skärmbild!"
 
-#: src/game.cpp:491
+#: src/game.cpp:492
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr ""
 "Förbindelsen till servern förlorades, programmet kommer nu att avslutas."
 
-#: src/game.cpp:505
+#: src/game.cpp:506
 msgid "Network Error"
 msgstr "Nätverksfel"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1024
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerar handelserbjudanden"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1031
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1406
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Kunde inte ladda karta"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1407
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunde inte ladda %s"
@@ -439,13 +439,14 @@ 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:1278
-#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
-#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
-#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
-#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: 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/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/textdialog.cpp:45 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -549,7 +550,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
-#: src/gui/socialwindow.cpp:847
+#: src/gui/socialwindow.cpp:981
 msgid "Create"
 msgstr "Skapa"
 
@@ -607,7 +608,7 @@ msgstr "Ändra epostadress"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
-#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:237
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -703,12 +704,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/gui/chatwindow.cpp:585
+#: src/gui/chatwindow.cpp:588
 #, fuzzy, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%d spelare är närvarande."
 
-#: src/gui/chatwindow.cpp:968
+#: src/gui/chatwindow.cpp:971
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -855,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:1242 src/gui/popupmenu.cpp:1325
-#: src/gui/popupmenu.cpp:1365
+#: src/gui/popupmenu.cpp:1381 src/gui/popupmenu.cpp:1464
+#: src/gui/popupmenu.cpp:1504
 msgid "Unequip"
 msgstr "Avrusta"
 
@@ -902,32 +903,32 @@ msgid "id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
-#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1383
+#: src/gui/popupmenu.cpp:1466 src/gui/popupmenu.cpp:1506
 msgid "Equip"
 msgstr "Utrusta"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
-#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
-#: src/gui/popupmenu.cpp:1370
+#: 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
 msgid "Use"
 msgstr "Använd"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
-#: src/gui/popupmenu.cpp:1373
+#: src/gui/popupmenu.cpp:1389 src/gui/popupmenu.cpp:1474
+#: src/gui/popupmenu.cpp:1512
 #, fuzzy
 msgid "Drop..."
 msgstr "Släpp"
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
-#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1394
+#: src/gui/popupmenu.cpp:1479 src/gui/popupmenu.cpp:1517
 msgid "Split"
 msgstr "Dela"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:461
 msgid "Outfits"
 msgstr ""
 
@@ -936,17 +937,17 @@ msgid "Weight:"
 msgstr "Vikt:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
-#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1362 src/gui/popupmenu.cpp:1482
+#: src/gui/popupmenu.cpp:1520 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Lagra"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1401
 msgid "Retrieve"
 msgstr "Hämta"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
-#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: 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
 msgid "Drop"
 msgstr "Släpp"
@@ -1225,7 +1226,7 @@ msgstr "Vidare"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:500
 #, fuzzy
 msgid "Clear"
 msgstr "Spjut"
@@ -1269,111 +1270,111 @@ msgstr "Avrusta"
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:554
 #, fuzzy
 msgid "@@trade|Trade@@"
 msgstr "@@trade|Handla med %s@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:530
+#: src/gui/popupmenu.cpp:555
 #, fuzzy
 msgid "@@attack|Attack@@"
 msgstr "@@attack|Attackera %s@@"
 
 #. TRANSLATORS: Whispering a player.
-#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:326
 #, fuzzy
 msgid "@@whisper|Whisper@@"
 msgstr "@@use|Använd@@"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:559
 #, fuzzy
 msgid "@@heal|Heal@@"
 msgstr "@@cancel|Avbryt@@"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:565
 #, fuzzy
 msgid "@@friend|Be friend@@"
 msgstr "@@retrieve|Hämta@@"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
-#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
-#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:339 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:566 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:590
 #, fuzzy
 msgid "@@disregard|Disregard@@"
 msgstr "@@disregard|Strunta i %s@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:334 src/gui/popupmenu.cpp:340
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:573
 #, fuzzy
 msgid "@@ignore|Ignore@@"
 msgstr "@@ignore|Ignorera %s@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
-#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
-#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
-#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
-#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:335 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:352
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:580 src/gui/popupmenu.cpp:585
 #, fuzzy
 msgid "@@erase|Erase@@"
 msgstr "@@use|Använd@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
-#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
-#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:564
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:589
 #, fuzzy
 msgid "@@unignore|Unignore@@"
 msgstr "@@unignore|Sluta ignorera %s@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
-#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:358
+#: src/gui/popupmenu.cpp:579 src/gui/popupmenu.cpp:591
 #, fuzzy
 msgid "@@ignore|Completely ignore@@"
 msgstr "@@ignore|Ignorera %s fullständigt@@"
 
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
-#: src/gui/popupmenu.cpp:574
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:366
+#: src/gui/popupmenu.cpp:599
 msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:367
+#: src/gui/popupmenu.cpp:600
 msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:619
 #, fuzzy
 msgid "@@party|Invite to party@@"
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:599
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:624
 #, fuzzy
 msgid "@@kick party|Kick from party@@"
 msgstr "@@admin-kick|Sparka spelare@@"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
-#: src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:638
 #, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
 msgstr "@@admin-kick|Sparka spelare@@"
 
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:640
 msgid "@@guild-pos|Change pos in guild >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
-#: src/gui/popupmenu.cpp:620
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:645
 #, fuzzy
 msgid "@@guild|Invite to guild@@"
 msgstr "/party > Bjud in en spelare till din grupp"
@@ -1387,22 +1388,22 @@ msgid "@@nuke|Nuke@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:601
 msgid "@@move|Move@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:602
 #, fuzzy
 msgid "@@undress|Undress@@"
 msgstr "@@unignore|Sluta ignorera %s@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
-#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:607
 msgid "@@buy|Buy@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
-#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:608
 #, fuzzy
 msgid "@@sell|Sell@@"
 msgstr "@@use|Använd@@"
@@ -1412,195 +1413,233 @@ msgstr "@@use|Använd@@"
 msgid "@@talk|Talk@@"
 msgstr "@@attack|Attackera %s@@"
 
-#: src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:251
 #, fuzzy
 msgid "@@admin-kick|Kick@@"
 msgstr "@@admin-kick|Sparka spelare@@"
 
-#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:260
+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:270
+#, fuzzy
+msgid "@@add attack|Add to attack list@@"
+msgstr "@@attack|Attackera %s@@"
+
+#: src/gui/popupmenu.cpp:272
+msgid "@@add attack ignore|Add to ignore list@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:401
 #, fuzzy
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Använd namn i chatt@@"
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:405 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:452 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:483 src/gui/popupmenu.cpp:650
+#: src/gui/popupmenu.cpp:674
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Avbryt@@"
 
-#: src/gui/popupmenu.cpp:279
+#: src/gui/popupmenu.cpp:304
 #, c-format
 msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:428
 #, fuzzy
 msgid "@@pickup|Pick up@@"
 msgstr "@@pickup|Plocka upp %s@@"
 
-#: src/gui/popupmenu.cpp:404
+#: src/gui/popupmenu.cpp:429
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:422
+#: src/gui/popupmenu.cpp:447
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:448
 msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:449
 msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:462
 msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+#: src/gui/popupmenu.cpp:478 src/gui/windowmenu.cpp:91
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:454
+#: src/gui/popupmenu.cpp:479
 msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:480
 #, fuzzy
 msgid "@@edit spell|Edit spell@@"
 msgstr "@@use|Använd@@"
 
-#: src/gui/popupmenu.cpp:473
+#: src/gui/popupmenu.cpp:498
 msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:506
 #, fuzzy
 msgid "Disable highlight"
 msgstr "Flikmarkering"
 
-#: src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:511
 #, fuzzy
 msgid "Enable highlight"
 msgstr "Flikmarkering"
 
-#: src/gui/popupmenu.cpp:491
+#: src/gui/popupmenu.cpp:516
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496
+#: src/gui/popupmenu.cpp:521
 #, fuzzy
 msgid "Remove name"
 msgstr "Kom ihåg användarnamnet"
 
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:526
 #, fuzzy
 msgid "Enable away"
 msgstr "Kan inte köpa."
 
-#: src/gui/popupmenu.cpp:506
+#: src/gui/popupmenu.cpp:531
 #, fuzzy
 msgid "Disable away"
 msgstr "Tillåt/neka handel"
 
-#: src/gui/popupmenu.cpp:512
+#: src/gui/popupmenu.cpp:537
 msgid "@@leave party|Leave@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:658
 #, fuzzy
 msgid "Change guild position"
 msgstr "Ändra"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:671
 #, c-format
 msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1044
+#: src/gui/popupmenu.cpp:1069
 msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1045
+#: src/gui/popupmenu.cpp:1070
 msgid "Name:                    "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1206
+#: src/gui/popupmenu.cpp:1345
 #, fuzzy
 msgid "Add to trade"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:1212
+#: src/gui/popupmenu.cpp:1351
 #, fuzzy
 msgid "Add to trade 10"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:1215
+#: src/gui/popupmenu.cpp:1354
 #, fuzzy
 msgid "Add to trade half"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1217
+#: src/gui/popupmenu.cpp:1356
 #, fuzzy
 msgid "Add to trade all"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1229
+#: src/gui/popupmenu.cpp:1368
 #, fuzzy
 msgid "Store 10"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1232
+#: src/gui/popupmenu.cpp:1371
 #, fuzzy
 msgid "Store half"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1234
+#: src/gui/popupmenu.cpp:1373
 #, fuzzy
 msgid "Store all"
 msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:1268
+#: src/gui/popupmenu.cpp:1407
 #, fuzzy
 msgid "Retrieve 10"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1271
+#: src/gui/popupmenu.cpp:1410
 #, fuzzy
 msgid "Retrieve half"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1273
+#: src/gui/popupmenu.cpp:1412
 #, fuzzy
 msgid "Retrieve all"
 msgstr "Hämta"
 
-#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1415 src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1521
 #, fuzzy
 msgid "Add to chat"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+#: src/gui/popupmenu.cpp:1442 src/gui/popupmenu.cpp:1487
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1386
+#: src/gui/popupmenu.cpp:1525
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+#: src/gui/popupmenu.cpp:1551 src/gui/popupmenu.cpp:1584
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1590
 msgid "Show"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:1612 src/gui/socialwindow.cpp:837
+#: src/gui/socialwindow.cpp:872
+#, fuzzy
+msgid "(default)"
+msgstr "Förval"
+
+#: src/gui/popupmenu.cpp:1622
+#, fuzzy
+msgid "Move up"
+msgstr "Gå uppåt"
+
+#: src/gui/popupmenu.cpp:1627
+#, fuzzy
+msgid "Move down"
+msgstr "Gå nedåt"
+
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1635
+#, fuzzy
+msgid "Remove"
+msgstr "Kom ihåg användarnamnet"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Save state"
 msgstr ""
@@ -1807,7 +1846,7 @@ msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
-#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:144 src/gui/setup_other.cpp:148
 msgid "Edit"
 msgstr ""
 
@@ -1933,116 +1972,121 @@ msgstr "Förval"
 msgid "Key Conflict(s) Detected."
 msgstr "Samma tangent används på flera ställen."
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:101
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:104
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:109
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:113
 #, fuzzy
 msgid "Highlight map portals"
 msgstr "Markering"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:118
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:123
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:127
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:130
 #, fuzzy
 msgid "Cycle monster targets"
 msgstr "Visa namn"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:133
 #, fuzzy
 msgid "Enable bot checker"
 msgstr "Aktivera joystick"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:136
 #, fuzzy
 msgid "Highlight floor items"
 msgstr "Markering"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:139
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:150
 #, fuzzy
 msgid "Enable shop mode"
 msgstr "Tillåt/neka handel"
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:153
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:156
 #, fuzzy
 msgid "Enable debug log"
 msgstr "Kan inte köpa."
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:159
 #, fuzzy
 msgid "Enable server side attack"
 msgstr "Kan inte köpa."
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:162
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:165
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:168
 #, fuzzy
 msgid "Enable quick stats"
 msgstr "Aktivera joystick"
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:171
 #, fuzzy
 msgid "Show warps particles"
 msgstr "som partikel"
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:174
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:175
+#: src/gui/setup_other.cpp:177
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:180
 #, fuzzy
 msgid "Show own hp bar"
 msgstr "Visa namn"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:183
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:186
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:189
 msgid "Show extended minimaps"
 msgstr ""
 
+#: src/gui/setup_other.cpp:192
+#, fuzzy
+msgid "Enable attack filter"
+msgstr "Kan inte köpa."
+
 #: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relation"
@@ -2142,8 +2186,8 @@ msgstr "Hjälp"
 msgid "Theme Changed"
 msgstr "Ändra"
 
-#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
-#: src/gui/setup_video.cpp:720
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:722
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringen ska börja gälla."
 
@@ -2303,8 +2347,8 @@ msgstr "Bakgrund"
 msgid "FPS limit:"
 msgstr "FPS-gräns:"
 
-#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
-#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:649 src/gui/setup_video.cpp:812
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS-gräns:"
@@ -2334,66 +2378,66 @@ msgstr "Partikeldetaljer"
 msgid "Font size"
 msgstr "Typsnittsgrad"
 
-#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
-#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
-#: src/gui/setup_video.cpp:808
+#: 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
 #, fuzzy
 msgid "None"
 msgstr "Nej"
 
-#: src/gui/setup_video.cpp:529
+#: src/gui/setup_video.cpp:531
 #, 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:535
+#: src/gui/setup_video.cpp:537
 #, 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:546
+#: src/gui/setup_video.cpp:548
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Byte till helskärm"
 
-#: src/gui/setup_video.cpp:547
+#: src/gui/setup_video.cpp:549
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: src/gui/setup_video.cpp:559
+#: src/gui/setup_video.cpp:561
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Ändrar OpenGL"
 
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:562
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: src/gui/setup_video.cpp:698
+#: src/gui/setup_video.cpp:700
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:699
+#: src/gui/setup_video.cpp:701
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+#: src/gui/setup_video.cpp:716 src/gui/setup_video.cpp:721
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Skärmupplösning ändrad"
 
-#: src/gui/setup_video.cpp:717
+#: src/gui/setup_video.cpp:719
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:751
+#: src/gui/setup_video.cpp:753
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Inställningar för partikeleffekter ändrade."
 
-#: src/gui/setup_video.cpp:752
+#: src/gui/setup_video.cpp:754
 msgid "Changes will take effect on map change."
 msgstr "Förändringar kommer att börja gälla när du byter karta."
 
@@ -2530,126 +2574,141 @@ msgstr ""
 msgid "Are you sure you want to leave party %s?"
 msgstr "Är du säker på att du vill avsluta?"
 
-#: src/gui/socialwindow.cpp:515
+#: src/gui/socialwindow.cpp:514
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:784
+#: src/gui/socialwindow.cpp:783
+#, fuzzy
+msgid "Atk"
+msgstr "Attackera"
+
+#: src/gui/socialwindow.cpp:823
+#, fuzzy
+msgid "Selected mobs"
+msgstr "Välj okej"
+
+#: src/gui/socialwindow.cpp:855
+#, fuzzy
+msgid "Ignore mobs"
+msgstr "Ignorerad"
+
+#: src/gui/socialwindow.cpp:918
 msgid "Create Guild"
 msgstr "Skapa gille"
 
-#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
+#: src/gui/socialwindow.cpp:919 src/gui/socialwindow.cpp:1335
 #, fuzzy
 msgid "Create Party"
 msgstr "Skapa karaktär"
 
-#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
+#: src/gui/socialwindow.cpp:961 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:848
+#: src/gui/socialwindow.cpp:982
 #, fuzzy
 msgid "Invite"
 msgstr "Bjud in spelare"
 
-#: src/gui/socialwindow.cpp:849
+#: src/gui/socialwindow.cpp:983
 #, fuzzy
 msgid "Leave"
 msgstr "Stor"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1124
 #, fuzzy, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepterade injudan från %s."
 
-#: src/gui/socialwindow.cpp:986
+#: src/gui/socialwindow.cpp:1134
 #, fuzzy, c-format
 msgid "Rejected party invite from %s."
 msgstr "Avslog inbjudan från %s."
 
-#: src/gui/socialwindow.cpp:1003
+#: src/gui/socialwindow.cpp:1151
 #, fuzzy, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepterade injudan från %s."
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1161
 #, fuzzy, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Avslog inbjudan från %s."
 
-#: src/gui/socialwindow.cpp:1057
+#: src/gui/socialwindow.cpp:1205
 #, fuzzy, c-format
 msgid "Creating guild called %s."
 msgstr "Kunde inte skapa gille."
 
-#: src/gui/socialwindow.cpp:1080
+#: src/gui/socialwindow.cpp:1228
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1094
+#: src/gui/socialwindow.cpp:1242
 #, fuzzy
 msgid "Guild Name"
 msgstr "Gille"
 
-#: src/gui/socialwindow.cpp:1095
+#: src/gui/socialwindow.cpp:1243
 #, fuzzy
 msgid "Choose your guild's name."
 msgstr "Välj din server"
 
-#: src/gui/socialwindow.cpp:1109
+#: src/gui/socialwindow.cpp:1257
 #, fuzzy
 msgid "Received guild request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/socialwindow.cpp:1115
+#: src/gui/socialwindow.cpp:1263
 #, 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:1121
+#: src/gui/socialwindow.cpp:1269
 #, fuzzy
 msgid "Accept Guild Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/socialwindow.cpp:1136
+#: src/gui/socialwindow.cpp:1284
 msgid "Received party request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/socialwindow.cpp:1147
+#: src/gui/socialwindow.cpp:1295
 #, fuzzy
 msgid "You have been invited you to join a party."
 msgstr "%s har bjudit in dig till sin grupp."
 
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1299
 #, 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:1159
+#: src/gui/socialwindow.cpp:1307
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig till sin grupp."
 
-#: src/gui/socialwindow.cpp:1164
+#: src/gui/socialwindow.cpp:1312
 #, 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:1173
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Party Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/socialwindow.cpp:1188
+#: src/gui/socialwindow.cpp:1336
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1193
+#: src/gui/socialwindow.cpp:1341
 #, fuzzy
 msgid "Party Name"
 msgstr "Grupp"
 
-#: src/gui/socialwindow.cpp:1194
+#: src/gui/socialwindow.cpp:1342
 #, fuzzy
 msgid "Choose your party's name."
 msgstr "Välj din server"
@@ -3149,30 +3208,30 @@ msgstr "Kommando: /who"
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:202
 #, fuzzy
 msgid "Target Type:"
 msgstr "Välj spelare"
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 #, fuzzy
 msgid "Magic level:"
 msgstr "Maxnivå"
 
-#: src/gui/textcommandeditor.cpp:217
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:223
+#: src/gui/textcommandeditor.cpp:226
 #, fuzzy
 msgid "School level:"
 msgstr "Visa namn"
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:231
 msgid "Save"
 msgstr ""
 
@@ -4083,74 +4142,74 @@ msgid ""
 "strange behaviour."
 msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
 
-#: src/localplayer.cpp:338
+#: src/localplayer.cpp:339
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1344
+#: src/localplayer.cpp:1345
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Kunde inte plocka upp."
 
-#: src/localplayer.cpp:1346
+#: src/localplayer.cpp:1347
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1348
+#: src/localplayer.cpp:1349
 msgid "Item is too far away"
 msgstr ""
 
-#: src/localplayer.cpp:1350
+#: src/localplayer.cpp:1351
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Servern är full"
 
-#: src/localplayer.cpp:1352
+#: src/localplayer.cpp:1353
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1355
+#: src/localplayer.cpp:1356
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1358
+#: src/localplayer.cpp:1359
 #, 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:1383
+#: src/localplayer.cpp:1384
 #, 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:3099
+#: src/localplayer.cpp:3110
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3392
+#: src/localplayer.cpp:3408
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+#: src/localplayer.cpp:3410 src/localplayer.cpp:3425
 #, fuzzy
 msgid "Follow canceled"
 msgstr " avbruten"
 
-#: src/localplayer.cpp:3401
+#: src/localplayer.cpp:3417
 #, fuzzy
 msgid "Imitation: "
 msgstr "Ändra epostadress"
 
-#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+#: src/localplayer.cpp:3419 src/localplayer.cpp:3427
 #, fuzzy
 msgid "Imitation canceled"
 msgstr " avbruten"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3779
 #, fuzzy
 msgid "You see "
 msgstr "Du får %s."
author	Andrei Karas <akaras@inbox.ru>	2011-04-22 02:23:13 +0300
committer	Andrei Karas <akaras@inbox.ru>	2011-04-22 02:23:13 +0300
commit	c5808ea0d60620d3c9768b2ca63398f5f62309e3 (patch)
tree	4f7d6e90d8f971e62171f064f25477ee95265140
parent	f6e795cc95dce10e1df44a89bd03539e72888a32 (diff)
download	manaverse-c5808ea0d60620d3c9768b2ca63398f5f62309e3.tar.gz manaverse-c5808ea0d60620d3c9768b2ca63398f5f62309e3.tar.bz2 manaverse-c5808ea0d60620d3c9768b2ca63398f5f62309e3.tar.xz manaverse-c5808ea0d60620d3c9768b2ca63398f5f62309e3.zip