46 files changed, 18480 insertions, 18983 deletions

diff --git a/data/translations/help/de.po b/data/translations/help/de.po
index 5703136d9..720ff5d20 100644
--- a/data/translations/help/de.po
+++ b/data/translations/help/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-04-22 17:34+0000\n"
+"PO-Revision-Date: 2012-04-28 15:31+0000\n"
 "Last-Translator: Marco Jäger <>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -34,8 +34,11 @@ msgstr "Übersetzer"
 msgid "##2Esc##P                      \"Quit\""
 msgstr "##2Esc##P                      \"Beenden\""
 
-msgid "##2m##P                        \"Use #itenplz spell\""
-msgstr "##2m##P                        \"den #itenplz Zauber benutzen\""
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr "Die meisten Befehle arbeiten im Flüsterchat.\nZum Beispiel der Befehl '/imitation' im Flüsterchat mit nick1,\nähnlich dem Befehl '/imitation nick1'."
 
 msgid "##2KeyPad[3]##P                \"On / Off audio\""
 msgstr "##2KeyPad[3]##P                \"Ein / Aus Ton\""
@@ -53,6 +56,12 @@ msgid "KEYBOARD:"
 msgstr "TASTATUR:"
 
 msgid ""
+" If you're having troubles, please first of all read the FAQ. If you\n"
+" can't find a solution to your problem, feel free to check our\n"
+" Bugs/Support section of the forum:"
+msgstr " Wenn Sie Probleme haben, dann lesen Sie bitte zuerst die FAQ. Wenn Sie\n dort keine Lösung für Ihr Problem finden können, dann zögern Sie nicht,\n den Fehler- / Hilfebereich unseres Forums zu besuchen:"
+
+msgid ""
 "##2     http://forums.themanaworld.org/viewforum.php?f=3\n"
 " or visit IRC channel:"
 msgstr "##2     http://forums.themanaworld.org/viewforum.php?f=3\n oder besuche den IRC Raum:"
@@ -95,12 +104,8 @@ msgid ""
 "   private messages to you in-game?"
 msgstr " - ##2allow whispers##P: Möchten Sie mit jedem Spieler Privatnachrichten\n   im Spiel schreiben und auch bekommen?"
 
-msgid ""
-"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
-" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making\n"
-" sure this game can't ever run away from you."
-msgstr "##2ManaPlus##P ist ernsthaft bemüht, einen innovativen und freien Open\n Source MMORPG-Client zu erstellen.Mana verwendet 2D-Grafik und zielt\n darauf ab, eine große und vielfältig interaktive Welt zu schaffen.\n Es unterliegt der GPL, so dass sichergestellt ist, das dieses Spiel\n nicht wegkommen kann."
+msgid "##PMagic skills can be obtain by doing quests and missions in game."
+msgstr "##PMagiefähigkeiten sind durch Aufgaben und Missionen im Spiel erhältlich."
 
 msgid "Support"
 msgstr "Unterstützung"
@@ -108,8 +113,8 @@ msgstr "Unterstützung"
 msgid "##2z##P                        \"Pickup\""
 msgstr "##2z##P                        \"Aufheben\""
 
-msgid "##PMagic skills can be obtain by doing quests and missions in game."
-msgstr "##PMagiefähigkeiten sind durch Aufgaben und Missionen im Spiel erhältlich."
+msgid "##2m##P                        \"Use #itenplz spell\""
+msgstr "##2m##P                        \"den #itenplz Zauber benutzen\""
 
 msgid ""
 "Communication is often essential to success in this game. You can communicate\n"
@@ -442,6 +447,13 @@ msgid "##2RightControl##P             \"Wear Outfit\""
 msgstr "##2RightControl##P             \"Ausrüstung anziehen\""
 
 msgid ""
+"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
+" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
+" sure this game can't ever run away from you."
+msgstr "##2ManaPlus##P ist ernsthaft bemüht, einen innovativen und freien Open\nSource MMORPG-Client zu erstellen. Mana verwendet 2D-Grafik und zielt\ndarauf ab, eine große und vielfältig interaktive Welt zu schaffen.\nEs unterliegt der GPL, so dass sichergestellt ist, das dieses Spiel\nnicht wegkommen kann."
+
+msgid ""
 "You can buy or sell items from players shops.\n"
 "Right click on player and select \"Buy\" or \"Sell\""
 msgstr "Sie können aus Spielern Geschäften Artikel kaufen oder verkaufen.\n Rechtsklick auf Spieler und wählen Sie \"Kauf\" oder \"Verkauf\"."
@@ -460,12 +472,6 @@ msgid ""
 " Added many features, improved perfomance, stability, security and more."
 msgstr "##2ManaPlus##P ist ein erweiterter Client, basierend auf dem Code des\n ##2Mana##P Clients. Hinzugefügt wurden viele Funktionen, verbesserte\n Performance, Stabilität, Sicherheit und vieles mehr."
 
-msgid ""
-" If you're having troubles, please first of all read the FAQ. If you\n"
-" can't find a solution to your problem, feel free to check our\n"
-" Bugs/Support section of the forum:"
-msgstr "Wenn Sie Probleme haben, dann lesen Sie bitte zuerst die FAQ. Wenn Sie\ndort keine Lösung für Ihr Problem finden können, dann zögern Sie nicht,\nden Fehler- / Hilfebereich unseres Forums zu besuchen:"
-
 msgid "##2SpaceBar##P                 \"Select OK\""
 msgstr "##2SpaceBar##P                 \"Auswahl OK\""
 
@@ -572,8 +578,8 @@ msgstr "##2RIGHT##P                    \"Bewegung nach Rechts\""
 msgid "##2RightBracket(])##P          \"Copy Equiped to Outfit\""
 msgstr "##2RightBracket(])##P          \"Kopieren der Ausstattung zur Ausrüstung\""
 
-msgid "/undress NICK - remove all clothes from nick. Local effect only."
-msgstr "/undress NICK - entfernt alle Kleider von NICK. Wirkung ist nur lokal."
+msgid "##2t##P                        \"Talk\""
+msgstr "##2t##P                        \"Reden\""
 
 msgid "##2n##P                        \"Target NPC\""
 msgstr "##2n##P                        \"Target NPC\""
@@ -623,8 +629,8 @@ msgstr "##2F5##P                       \"Fertigkeitsfenster\""
 msgid "Commands"
 msgstr "Befehle"
 
-msgid "##2t##P                        \"Talk\""
-msgstr "##2t##P                        \"Reden\""
+msgid "/undress NICK - remove all clothes from nick. Local effect only."
+msgstr "/undress NICK - entfernt alle Kleider von NICK. Wirkung ist nur lokal."
 
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
@@ -667,11 +673,6 @@ msgstr "##2BackQuote(`)##P             \"Ausrüstungsfenster\""
 msgid "##2Period(.)##P                \"Change Move to Target type\""
 msgstr "##2Period(.)##P                \"Ändern der Bewegungsart zum Ziel\""
 
-msgid ""
-"About yellow bar you can read here:\n"
-"http://manaplus.evolonline.org/yellowbar"
-msgstr "Informationen über die gelbe Leiste können Sie hier lesen:\nhttp://manaplus.evolonline.org/yellowbar"
-
 msgid "##2F10##P                      \"Debug Window\""
 msgstr "##2F10##P                      \"Debugfenster\""
 
@@ -828,19 +829,13 @@ msgid "##2Insert##P                   \"Item Shortcut 14\""
 msgstr "##2Insert##P                   \"Item Tastaturkürzel 14\""
 
 msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
-msgstr "Die meisten Befehle arbeiten im Flüsterchat.\nZum Beispiel der Befehl '/imitation' im Flüsterchat mit nick1,\nähnlich dem Befehl '/imitation nick1'."
+"About yellow bar you can read here:\n"
+"http://manaplus.evolonline.org/yellowbar"
+msgstr "Informationen über die gelbe Leiste können Sie hier lesen:\nhttp://manaplus.evolonline.org/yellowbar"
 
 msgid "##2F6##P                       \"Minimap Window\""
 msgstr "##2F6##P                       \"Minikartenfenster\""
 
-msgid ""
-" Currently only stackable items like food, but not weapons or clothes can be\n"
-" used with the shortcut window."
-msgstr " Derzeit können nur stapelbare Gegenstände wie Nahrungsmittel, aber nicht Waffen\n oder Kleidung mit dem Schnellzugriffsfenster verwendet werden."
-
 msgid "##2c##P                        \"Quick heal target or self\""
 msgstr "##2c##P                        \"Schnelles heilen von Ziel oder sich selbst"
 
diff --git a/data/translations/help/es.po b/data/translations/help/es.po
index 6abc9a3f6..fd5d6f9ec 100644
--- a/data/translations/help/es.po
+++ b/data/translations/help/es.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-04-20 23:50+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
+"PO-Revision-Date: 2012-04-28 13:10+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/manaplus/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,8 +34,11 @@ msgstr "Traductores"
 msgid "##2Esc##P                      \"Quit\""
 msgstr "##2Esc##P                      \"Dejar\""
 
-msgid "##2m##P                        \"Use #itenplz spell\""
-msgstr "##2m##P                        \"Usar hechizo #itenplz\""
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr ""
 
 msgid "##2KeyPad[3]##P                \"On / Off audio\""
 msgstr "##2KeyPad[3]##P                \"Encender / Apagar audio\""
@@ -53,6 +56,12 @@ msgid "KEYBOARD:"
 msgstr "TECLADO:"
 
 msgid ""
+" If you're having troubles, please first of all read the FAQ. If you\n"
+" can't find a solution to your problem, feel free to check our\n"
+" Bugs/Support section of the forum:"
+msgstr ""
+
+msgid ""
 "##2     http://forums.themanaworld.org/viewforum.php?f=3\n"
 " or visit IRC channel:"
 msgstr "##2     http://forums.themanaworld.org/viewforum.php?f=3\n o visita el canal IRC:"
@@ -95,12 +104,8 @@ msgid ""
 "   private messages to you in-game?"
 msgstr " - ##2permitir susurros##P: ¿Deseas permitir que cualquier jugador te envíe\n   mensajes privados en el juego?"
 
-msgid ""
-"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
-" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making\n"
-" sure this game can't ever run away from you."
-msgstr "##2Mana##P es fruto de un arduo esfuerzo crear un Cliente MMORPG innovador,\n libre y de código abierto. Mana usa gráficos 2D y apunta a crear un gran\n mundo diverso e interactivo. Está licenciado bajo la GPL, asegurando que\n este juego nunca dejará de estar a tu alcance."
+msgid "##PMagic skills can be obtain by doing quests and missions in game."
+msgstr "##PLas Habilidades Mágicas pueden ser obtenidas haciedo misiones y búsquedas en el juego."
 
 msgid "Support"
 msgstr "Apoyo"
@@ -108,8 +113,8 @@ msgstr "Apoyo"
 msgid "##2z##P                        \"Pickup\""
 msgstr "##2z##P                        \"Recojer\""
 
-msgid "##PMagic skills can be obtain by doing quests and missions in game."
-msgstr "##PLas Habilidades Mágicas pueden ser obtenidas haciedo misiones y búsquedas en el juego."
+msgid "##2m##P                        \"Use #itenplz spell\""
+msgstr "##2m##P                        \"Usar hechizo #itenplz\""
 
 msgid ""
 "Communication is often essential to success in this game. You can communicate\n"
@@ -442,6 +447,13 @@ msgid "##2RightControl##P             \"Wear Outfit\""
 msgstr "##2RightControl##P             \"Ponerse una Vestimenta\""
 
 msgid ""
+"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
+" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
+" sure this game can't ever run away from you."
+msgstr ""
+
+msgid ""
 "You can buy or sell items from players shops.\n"
 "Right click on player and select \"Buy\" or \"Sell\""
 msgstr ""
@@ -460,12 +472,6 @@ msgid ""
 " Added many features, improved perfomance, stability, security and more."
 msgstr ""
 
-msgid ""
-" If you're having troubles, please first of all read the FAQ. If you\n"
-" can't find a solution to your problem, feel free to check our\n"
-" Bugs/Support section of the forum:"
-msgstr "Si estás teniendo problemas, por favor, primero que nada, lee la FAQ.\nSi no encuentras una solución a tu problema, siéntete libre de chequear\nnuestra sección Problemas/Soporte del foro:"
-
 msgid "##2SpaceBar##P                 \"Select OK\""
 msgstr "##2Barra Espaciadora##P                 \"Seleccionar OK\""
 
@@ -572,8 +578,8 @@ msgstr "##2Derecha##P                    \"Moverse a la Derecha\""
 msgid "##2RightBracket(])##P          \"Copy Equiped to Outfit\""
 msgstr "##2CorcheteDerecho(])##P       \"Copiar lo equipado al Equipamiento\""
 
-msgid "/undress NICK - remove all clothes from nick. Local effect only."
-msgstr "/undress NICK - quitar toda la ropa de un nick (efecto local sólamente)."
+msgid "##2t##P                        \"Talk\""
+msgstr "##2t##P                        \"Hablar\""
 
 msgid "##2n##P                        \"Target NPC\""
 msgstr "##2n##P                        \"Apuntar a NPC\""
@@ -623,8 +629,8 @@ msgstr "##2F5##P                       \"Ventana de Habilidades\""
 msgid "Commands"
 msgstr "Comandos"
 
-msgid "##2t##P                        \"Talk\""
-msgstr "##2t##P                        \"Hablar\""
+msgid "/undress NICK - remove all clothes from nick. Local effect only."
+msgstr "/undress NICK - quitar toda la ropa de un nick (efecto local sólamente)."
 
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
@@ -667,11 +673,6 @@ msgstr "##2BackQuote(`)##P             \"Ventana de Equipamientos\""
 msgid "##2Period(.)##P                \"Change Move to Target type\""
 msgstr "##2Punto(.)##P                \"Cambiar tipo de Movimiento al objetivo\""
 
-msgid ""
-"About yellow bar you can read here:\n"
-"http://manaplus.evolonline.org/yellowbar"
-msgstr "Acerca de la barra amarilla, puedes leer aquí:\nhttp://manaplus.evolonline.org/es/yellowbar"
-
 msgid "##2F10##P                      \"Debug Window\""
 msgstr "##2F10##P                      \"Ventana de Depuración\""
 
@@ -828,19 +829,13 @@ msgid "##2Insert##P                   \"Item Shortcut 14\""
 msgstr "##2Insert##P                   \"Atajo de artículo 14\""
 
 msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
-msgstr ""
+"About yellow bar you can read here:\n"
+"http://manaplus.evolonline.org/yellowbar"
+msgstr "Acerca de la barra amarilla, puedes leer aquí:\nhttp://manaplus.evolonline.org/es/yellowbar"
 
 msgid "##2F6##P                       \"Minimap Window\""
 msgstr "##2F6##P                       \"Ventana del Minimapa\""
 
-msgid ""
-" Currently only stackable items like food, but not weapons or clothes can be\n"
-" used with the shortcut window."
-msgstr ""
-
 msgid "##2c##P                        \"Quick heal target or self\""
 msgstr "##2c##P                        \"Curar rápido al objetivoa o sí mismo\""
 
diff --git a/data/translations/help/fr.po b/data/translations/help/fr.po
index 7970b8436..caf780e45 100644
--- a/data/translations/help/fr.po
+++ b/data/translations/help/fr.po
@@ -1,10 +1,11 @@
 # en#
 # Translators:
 #   <andycootlapin@hotmail.fr>, 2012.
+# Bernard  <nard@bh28.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-04-16 20:06+0000\n"
+"PO-Revision-Date: 2012-05-09 09:05+0000\n"
 "Last-Translator: Choupom <andycootlapin@hotmail.fr>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -14,7 +15,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 msgid "##2End##P                      \"Change Attack Type\""
-msgstr ""
+msgstr "##2Fin##P                      \"Changer de type d'Attaque\""
 
 msgid "/serverunignoreall - unignore all whispers on server side."
 msgstr "/serverunignoreall - ne plus ignorer les chuchotements du côté serveur."
@@ -34,17 +35,20 @@ msgstr "Traducteurs"
 msgid "##2Esc##P                      \"Quit\""
 msgstr "##2Echap##P                      \"Quitter\""
 
-msgid "##2m##P                        \"Use #itenplz spell\""
-msgstr "##2m##P                        \"Utiliser le sort #itenplz\""
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr "La plupart des commandes  fonctionnent dans les onglets de conversation privée (whispers).\nPar example la commande /imitation tapée dans l'onglet de conversation avec NOM a le\n même effet que la commande /imitation Nom ou le clic-droit sur NOM suivi du choix imitation."
 
 msgid "##2KeyPad[3]##P                \"On / Off audio\""
-msgstr ""
+msgstr "##2KeyPad[3]##P                \"Audio On / Off\""
 
 msgid "##2F2##P                       \"Status Window\""
 msgstr "##2F2##P                       \"Fenêtre d'état\""
 
 msgid "/cacheinfo - show text cache info."
-msgstr ""
+msgstr "/cacheinfo - afficher l'info. du  cache texte."
 
 msgid "##2LeftAlt + Minus(-)##P       \"Emote Shortcut 11\""
 msgstr "##2Alt-Gauche + Moins(-)##P       \"Raccourci Émoticône 11\""
@@ -53,6 +57,12 @@ msgid "KEYBOARD:"
 msgstr "CLAVIER :"
 
 msgid ""
+" If you're having troubles, please first of all read the FAQ. If you\n"
+" can't find a solution to your problem, feel free to check our\n"
+" Bugs/Support section of the forum:"
+msgstr "Si vous rencontrez des problèmes, veuillez d'abord lire le FAQ.\nSi vous ne trouvez pas de solution, reportez vous à la rubrique \nBugs/support du forum:"
+
+msgid ""
 "##2     http://forums.themanaworld.org/viewforum.php?f=3\n"
 " or visit IRC channel:"
 msgstr "##2     http://forums.themanaworld.org/viewforum.php?f=3\n ou visite notre canal IRC :"
@@ -64,10 +74,10 @@ msgid "MOUSE:"
 msgstr "SOURIS :"
 
 msgid "/neutral NICK - add nick to neutral relation list."
-msgstr ""
+msgstr "/neutral NICK - ajouter NICK à la liste des relations neutres."
 
 msgid "/addpriorityattack NAME - add monster to priority attack list."
-msgstr ""
+msgstr "/addpriorityattack NOM - ajouter le monstre NOM à la liste d'attaques prioritairest."
 
 msgid "##2Enter##P                    \"Toggle Chat\""
 msgstr "##2Entrée##P                    \"Afficher/Cacher le chat\""
@@ -79,43 +89,39 @@ msgid "##2LeftControl##P              \"Attack\""
 msgstr "##2Ctrl-Gauche##P              \"Attaquer\""
 
 msgid "/priceload - load shop price from disc."
-msgstr ""
+msgstr "/priceload - Charger la liste de prix-boutique depuis le disque."
 
 msgid "##2s##P                        \"Sit\""
 msgstr "##2s##P                        \"S'asseoir\""
 
 msgid "##2e##P                        \"Kills Stats Window\""
-msgstr ""
+msgstr "##2e##P                        \"Fenêtre  Stats de chasse\""
 
 msgid "##2KeyPad[8]##P                \"Disable / Enable Game modifier keys\""
-msgstr ""
+msgstr "##2KeyPad[8]##P                \"désactiver / activer  les touches de modicateurs d'options de jeu\""
 
 msgid ""
 " - ##2allow whispers##P: Do you wish to allow arbitrary players to send\n"
 "   private messages to you in-game?"
-msgstr ""
+msgstr " - ##2allow whispers##P: Souhaitez vous permettre à n'importe-quel \njoueur de vous envoyer des messages privés en jeu ? "
 
-msgid ""
-"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
-" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making\n"
-" sure this game can't ever run away from you."
-msgstr ""
+msgid "##PMagic skills can be obtain by doing quests and missions in game."
+msgstr "##PDes compétences magiques peuvent être obtenues en faisant des quêtes et des missions dans le jeu."
 
 msgid "Support"
-msgstr ""
+msgstr "Support"
 
 msgid "##2z##P                        \"Pickup\""
 msgstr "##2z##P                        \"Ramasser\""
 
-msgid "##PMagic skills can be obtain by doing quests and missions in game."
-msgstr "##PDes compétences magiques peuvent être obtenues en faisant des quêtes et des missions dans le jeu."
+msgid "##2m##P                        \"Use #itenplz spell\""
+msgstr "##2m##P                        \"Utiliser le sort #itenplz\""
 
 msgid ""
 "Communication is often essential to success in this game. You can communicate\n"
 " in several ways:  By chatting and showing emotions (see above), by trading\n"
 " (with the right-click context menu), and by whispering."
-msgstr ""
+msgstr "Communiquer est souvent essential pur réussir dans le jeu. vous pouvez  communiquer\n de plusieurs manières: En discutant (chat) en montrant vos emotions (voir plus haut), en échangeant.\n (avec le menu contextuel clic-droitnu), et en chuchotant."
 
 msgid "##2a##P                        \"Target Closest\""
 msgstr "##2a##P                        \"Viser le monstre le plus proche\""
@@ -132,7 +138,7 @@ msgstr "##2Retour arrière##P                \"Raccourci Objet 13\""
 msgid ""
 " You can improve your skills by increasing job level. Each job level\n"
 " gives you 1 point to spend on basic skills."
-msgstr ""
+msgstr " Vous pouvez améliorer vos compétences en augmentant votre  niveau job (travail). Chaque niveau job\n vous donne un point a ajouter à vos compétences de base."
 
 msgid "##25##P                        \"Item Shortcut 5\""
 msgstr "##25##P                        \"Raccourci Objet 5\""
@@ -156,7 +162,7 @@ msgid "/all - show visible beings list in debug tab."
 msgstr "/all - afficher la liste des êtres visibles dans l'onglet de déboguage."
 
 msgid "For other server look servers pages for support."
-msgstr ""
+msgstr "Pour d'autres serveurs, reportez vous à leurs pages de support."
 
 msgid "Debug"
 msgstr "Déboguage"
@@ -165,7 +171,7 @@ msgid "##2LeftWinKey##P               \"Ignore input 1\""
 msgstr "##2Windows-Gauche##P               \"Ignorer l'entrée 1\""
 
 msgid "/addattack NAME - add monster to attack list."
-msgstr ""
+msgstr "/addattack NOM - ajoute le monstre NOM à la liste d'attaque."
 
 msgid ""
 " - ##2friend##P:  You consider this player a friend.  The player may chat,\n"
@@ -176,7 +182,7 @@ msgid ""
 "You can walk to warps automatically.\n"
 "Open Social Window (f11) and selecy Nav tab,\n"
 "then click on warp what you want."
-msgstr ""
+msgstr "Vous pouvez marcher jusqu'aux points de transport (warp points) automatiquement.\nOuvrez fa fenêtre Social (F11) et sélectionnez l'onglet Nav, puis cliquez sur le nom du point où vous voulez aller."
 
 msgid "##2LeftAlt + 7##P              \"Emote Shortcut 7\""
 msgstr "##2Alt-Gauche + 7##P              \"Raccourci Émoticône 7\""
@@ -185,7 +191,7 @@ msgid "##2LeftShift##P                \"Stop Attack\""
 msgstr "##2Shift-Gauche##P                \"Arrêter d'attaquer\""
 
 msgid "/setdrop N - set drop counter to requested value."
-msgstr ""
+msgstr "/setdrop N - choisit le nombre d'objets à jeter par la touche de jet rapide."
 
 msgid "##2LeftAlt + 8##P              \"Emote Shortcut 8\""
 msgstr "##2Alt-Gauche + 8##P              \"Raccourci Émoticône 8\""
@@ -203,7 +209,7 @@ msgid "##2LeftAlt + Equals(=)##P      \"Emote Shortcut 12\""
 msgstr "##2Alt-Gauche + Égal(=)##P              \"Raccourci Émoticône 12\""
 
 msgid "/createparty NAME - create party with selected name."
-msgstr ""
+msgstr "/createparty NOM - Crée un groupe appelé NOM."
 
 msgid "/heal NICK - heal nick."
 msgstr "/heal PSEUDO - soigner le joueur."
@@ -212,7 +218,7 @@ msgid "Contributors to client development"
 msgstr "Contributeurs au développement du client"
 
 msgid "/removeattack NAME - remove monster from attack list."
-msgstr ""
+msgstr "/removeattack NOM - Enlève le monstre NOM de la liste d'attaque."
 
 msgid "/where - print current player position to chat."
 msgstr "/where - affiche la position actuelle du joueur dans le chat."
@@ -220,10 +226,10 @@ msgstr "/where - affiche la position actuelle du joueur dans le chat."
 msgid ""
 " - ##2ignored##P:  You wish to completely ignore this player.  You will not\n"
 "   even see floating text for him or her anymore, nor emotions."
-msgstr ""
+msgstr " - ##2ignored##P:  Vous voulez ignorer completement ce joueur.  Vous ne verrez\n   même plus aucun texte flottant ni ses émotions."
 
 msgid "##2RightShift + key##P         \"Move to navigation point\""
-msgstr ""
+msgstr "##2Shift-Droite + key##P         \"Aller au point de navigation\""
 
 msgid "##24##P                        \"Item Shortcut 4\""
 msgstr "##24##P                        \"Raccourci Objet 4\""
@@ -232,19 +238,19 @@ msgid "##2PageUP##P                   \"Scroll Chat Up\""
 msgstr "##2PagePréc.##P                   \"Défiler le chat vers le haut\""
 
 msgid "/unignore NICK - Remove nick from ignore list."
-msgstr ""
+msgstr "/unignore NOM - Enlever NOM de la liste des ignorés."
 
 msgid "##2LeftAlt + 6##P              \"Emote Shortcut 6\""
 msgstr "##2Alt-Gauche + 6##P              \"Raccourci Émoticône 6\""
 
 msgid "IGNORING COMMUNICATION"
-msgstr ""
+msgstr "IGNORE LES COMMUNICATIONS"
 
 msgid "WINDOWS"
 msgstr "FENÊTRES"
 
 msgid "SUPPORT"
-msgstr ""
+msgstr "SUPPORT"
 
 msgid "##2LEFT##P                     \"Move Left\""
 msgstr "##2GAUCHE##P                     \"Aller à gauche\""
@@ -259,7 +265,7 @@ msgid "Other skills:"
 msgstr "Autres compétences :"
 
 msgid "##2MenuKey##P                  \"Item Shortcuts Key\""
-msgstr ""
+msgstr "##2MenuKey##P                  \"Touche de raccourcis objets\""
 
 msgid "##28##P                        \"Item Shortcut 8\""
 msgstr "##28##P                        \"Raccourci Objet 8\""
@@ -267,7 +273,7 @@ msgstr "##28##P                        \"Raccourci Objet 8\""
 msgid ""
 "You can use mumble voice chat for talking with other players.\n"
 "Start mumble before client start and enable mumble in settings."
-msgstr ""
+msgstr "Vous pouvez utiliser la conversation vocale Mumble pour parler aux autres joueurs.\nDémarrez Mumble avant le client et activez Mumple dans la configuration."
 
 msgid "##2RightAlt##P                 \"Copy Outfit\""
 msgstr "##2Alt-Droite##P                 \"Copier la tenue\""
@@ -287,26 +293,26 @@ msgid "##2r##P                        \"Enable/Disable Trading\""
 msgstr "##2r##P                        \"Activer/Désactiver les échanges\""
 
 msgid "/uptime - show client uptime."
-msgstr ""
+msgstr "/uptime - affiche le temps  client."
 
 msgid ""
 "The project includes the development of both a client and a server.\n"
 " Others are making worlds using Mana software. The Mana World project\n"
 " is the originator of the Mana project. Mana was split off to further\n"
 " facilitate development of other worlds."
-msgstr ""
+msgstr "Ce projet comprend le développement d'un serveur et d'un client.\nD'autres équipes c'ent des mondes en utilisant les logiciels Mana. Le projet \"The Mana World\" est l'initiateur du projet \"Mana\". Mana  à été divisé pour faciliter le développement de nouveaux mondes"
 
 msgid "/dumpg - dump graphics and some other settings to chat."
-msgstr ""
+msgstr "/dumpg - Ecrit les préférences graphiques and quelques autres dans la ligne de chat."
 
 msgid "/trade NICK - start trade with nick."
 msgstr "/trade PSEUDO - commencer un échange avec le joueur."
 
 msgid "/imitation NICK - start imitation mode."
-msgstr ""
+msgstr "/imitation NOM - Démarre le mode imitation du personnage NOM."
 
 msgid "##2LeftAlt + EmoteKey##P       \"Smilie\""
-msgstr ""
+msgstr "##2Alt-Gauche + EmoteKey##P       \"Emoticône\""
 
 msgid "##22##P                        \"Item Shortcut 2\""
 msgstr "##22##P                        \"Raccourci Objet 2\""
@@ -314,10 +320,10 @@ msgstr "##22##P                        \"Raccourci Objet 2\""
 msgid ""
 "You can imitate other players by selecting \"imitation\" in player context menu\n"
 " or type chat command: /imitate playername."
-msgstr ""
+msgstr "Vous pouvez imiter un autre joueur en choisissant \"imitation\" dans le menu contextuel ou en tapant /imitate NOM"
 
 msgid "##2Semicolon(;)##P             \"Set Direction Down\""
-msgstr ""
+msgstr "##2Point-virgule(;)##P             \"Se tourner vers le bas\""
 
 msgid ""
 "You can hide/show bars and buttons by right click and select menu item."
@@ -339,10 +345,10 @@ msgid "ABOUT MANAPLUS"
 msgstr "A PROPOS DE MANAPLUS"
 
 msgid "##2KeyPad0##P                  \"Change move type\""
-msgstr ""
+msgstr "##2KeyPad0##P                  \"Changer de type de mouvement\""
 
 msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
-msgstr ""
+msgstr "/pseudoaway, /pseudoaway MSG - active/désactive le mode pseudo away (pseudo-absent)."
 
 msgid "INDEX"
 msgstr "INDEX"
@@ -353,13 +359,13 @@ msgid ""
 msgstr "Tu peux désactiver la barre jaune,\nen pressant la touche 8 du clavier numérique."
 
 msgid "/ignoreall - add all whispers to ignore list."
-msgstr ""
+msgstr "/ignoreall - ajoute tous les joueurs à la liste d'ignorés."
 
 msgid "Other contributors"
 msgstr "Autres contributeurs"
 
 msgid "/ignore NICK - add nick to ignore list."
-msgstr ""
+msgstr "/ignore NOM - ajoute NOM à la liste d'ignorés."
 
 msgid "##23##P                        \"Item Shortcut 3\""
 msgstr "##23##P                        \"Raccourci Objet 3\""
@@ -373,40 +379,40 @@ msgstr "/outfit next - met la tenue suivante."
 msgid ""
 "You can set away mode,\n"
 "by type in chat command /away"
-msgstr ""
+msgstr "Vous pouvez activer le mode away (absent)\nen tapant /away <message d'absence optionnel> dans la ligne de conversation"
 
 msgid "/move X Y - move to X,Y position in short distance."
-msgstr ""
+msgstr "/move X Y - aller à la position proche X,Y ."
 
 msgid "Magic skills:"
 msgstr "Compétences magiques :"
 
 msgid "/addignoreattack NAME - add monster to ignore attack list."
-msgstr ""
+msgstr "/addignoreattack NOM - ajoute le monstre NOM à la liste d'ignorés."
 
 msgid "##2KeyPad[+]##P                \"Toggle camera mode\""
-msgstr ""
+msgstr "##2KeyPad[+]##P                \"changer de mode de vue camera\""
 
 msgid "##2Home##P                     \"Item Shortcut 15\""
 msgstr "##2Accueil##P                     \"Raccourci Objet 15\""
 
 msgid "/clear - clear current chat tab."
-msgstr ""
+msgstr "/clear - efface l'onglet de conversation courant."
 
 msgid "##2KeyPad[9]##P                \"Next chat tab line\""
-msgstr ""
+msgstr "##2KeyPad[9]##P                \"ligne de conversation suivante\""
 
 msgid "Chat commands"
-msgstr ""
+msgstr "Commandes de conversation (Chat)"
 
 msgid "Trade"
 msgstr "Échanger"
 
 msgid "/blacklist NICK - add nick to blacklist relation list."
-msgstr ""
+msgstr "/blacklist NOM - ajoute NOM a la liste noire de relations."
 
 msgid "##2Comma(,)##P                 \"Switch magic attack\""
-msgstr ""
+msgstr "##2Virgule(,)##P                 \"Changer d'attaque magique\""
 
 msgid "##2Tab##P                      \"Chat Auto Complete\""
 msgstr "##2Tab##P                      \"Auto-complétion du chat\""
@@ -418,13 +424,13 @@ msgid ""
 " - ##2save player list##P: Should your acquaintance list be saved when you\n"
 "   quit the game?  If you enable this option, your list will survive when you\n"
 "   quit and re-start."
-msgstr ""
+msgstr " - ##2save player list##P: Votre liste de relations doit-elle être suvegardée \n   quand vous quitttez le jeu?  Si vous activez sette option votre liste sera conservée lorsque\n   quittez et redémarrez."
 
 msgid "##2PageDOWN##P                 \"Scroll Chat Down\""
 msgstr "##2PageSuiv.##P                 \"Défiler le chat vers le bas\""
 
 msgid "##2KeyPad[2]##P                \"Enable / Disable away mode\""
-msgstr ""
+msgstr "##2KeyPad[2]##P                \"Activer / Désactiver le mode absent\""
 
 msgid "##2j##P                        \"Commands Window\""
 msgstr "##2j##P                        \"Fenêtre de commandes\""
@@ -442,15 +448,22 @@ msgid "##2RightControl##P             \"Wear Outfit\""
 msgstr "##2Ctrl-Droite##P             \"Mettre la tenue\""
 
 msgid ""
+"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
+" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
+" sure this game can't ever run away from you."
+msgstr "##2ManaPlus##P esst le résultat d'un effort important pour créer un client MMORPG innovant, libre et \n open source. Mana utilise des  graphics 2D and a pour but de  créer un monde\n vaste, varié et interactif. It is licensié sous GPL, ce qui vous rend\n surque ce jeu ne s'éloignera pas de vous."
+
+msgid ""
 "You can buy or sell items from players shops.\n"
 "Right click on player and select \"Buy\" or \"Sell\""
-msgstr ""
+msgstr "Vous pouvez acheter ou vendre des objets aux boutiques de joueurs.\nFaites un clic-droit sur le joueur et choisissez \"Acheter\" ou \"Vendre\""
 
 msgid "/erase NICK - add nick to erased list."
-msgstr ""
+msgstr "/erase NOM - ajoute NOM à la liste de joueurs effacés."
 
 msgid "/pricesave - save shop price to disc."
-msgstr ""
+msgstr "/pricesave - sauvegarder la liste de prix boutique sur le disque."
 
 msgid "COMMUNICATION:"
 msgstr "COMMUNICATION :"
@@ -458,19 +471,13 @@ msgstr "COMMUNICATION :"
 msgid ""
 "##2ManaPlus##P is extended client based on code from ##2Mana##P client.\n"
 " Added many features, improved perfomance, stability, security and more."
-msgstr ""
-
-msgid ""
-" If you're having troubles, please first of all read the FAQ. If you\n"
-" can't find a solution to your problem, feel free to check our\n"
-" Bugs/Support section of the forum:"
-msgstr ""
+msgstr "##2ManaPlus##P is un client étendu basé sur le  code du client  ##2Mana##P .\n De nombreuses  fonctionalités  ont été ajoutées, les perfomance, la stabilité, la securité ont été accrue set bien plus."
 
 msgid "##2SpaceBar##P                 \"Select OK\""
 msgstr "##2Espace##P                 \"Sélectionner OK\""
 
 msgid "##2Emote:##P enables the ability to express emotions."
-msgstr ""
+msgstr "##2Emote:##P active la possibilité d'exrimer des émotions."
 
 msgid "/friend NICK, /befriend NICK - add nick to friends list."
 msgstr "/friend PSEUDO, /befriend PSEUDO - ajoute le joueur à la liste des amis."
@@ -494,7 +501,7 @@ msgid ""
 " - ##2neutral##P:  As far as the game is concerned, this is the same as not\n"
 "   having the player listed:  the player may chat with you, but may only trade\n"
 "   or whisper if you have this option allowed for everyone."
-msgstr ""
+msgstr " - ##2neutral##P:  Dans la mesure ou le jeu est concerné, ceci est identique à\n   ne pas avoir le joueur listé:  le joueur peut converser avec vous mais ne peut échanger ou\n   chuchoter avec vous que si cette options est choisie pour tout le monde."
 
 msgid "Skills"
 msgstr "Compétences"
@@ -505,7 +512,7 @@ msgstr "##2Groupe Level1:##P permet à un perso de rejoindre un groupe."
 msgid ""
 " There you will find a list of all players you are acquainted with, as well as\n"
 " several configuration options:"
-msgstr ""
+msgstr " Vous trouverez là une liste de tout les joueurs avec qui vous avez des relations, ainsi que\n quelques options de cofiguration:"
 
 msgid ""
 "/msg NICK text, /whisper NICK text, /w NICK text - send whisper message to "
@@ -516,12 +523,12 @@ msgid "##2F1##P                       \"Help Window\""
 msgstr "##2F1##P                       \"Fenêtre d'aide\""
 
 msgid "##2g##P                        \"Change Attack Weapon Type\""
-msgstr ""
+msgstr "##2g##P                        \"Changer de type d'arme d'attaque\""
 
 msgid ""
 " The player list lists all of your acquaintances.  They are categorised as one\n"
 " of the following:"
-msgstr ""
+msgstr " La liste detoutes vos relations avec les joueurs.  Elles son classées dans\nl'une des catégories suivantes:"
 
 msgid "/outfit prev - wear previous outfit."
 msgstr "/outfit prev - met la tenue précédente."
@@ -529,13 +536,13 @@ msgstr "/outfit prev - met la tenue précédente."
 msgid ""
 "##P This file lists all contributors up to the current release. Check the wiki\n"
 "##P for the currently active development team."
-msgstr ""
+msgstr "##P Ce fichier liste tous les contributeurs, jusqu'à la version actuelle. Consultez la wiki\n##P pour la liste de l'équipe de développement active actuellement."
 
 msgid "Contributors to client/server development"
 msgstr "Contributeurs au développement client/serveur"
 
 msgid "##2KeyPad[1]##P                \"Change Follow mode\""
-msgstr ""
+msgstr "##2KeyPad[1]##P                \"Changer de mode de suivi\""
 
 msgid "SHORTCUTS:"
 msgstr "RACCOURCIS:"
@@ -553,12 +560,12 @@ msgid "##2Esc##P                      \"Deactivate Chat Input\""
 msgstr "##2Echap##P                      \"Désactiver la saisie dans le chat\""
 
 msgid "Player relations"
-msgstr ""
+msgstr "Relations joueurs"
 
 msgid ""
 "You can copy value from any bar,\n"
 "by right click on it and select in context menu \"Copy to chat\"."
-msgstr ""
+msgstr "Vous pouver  la valeur de chaque barre\nen faisant un clic-droit sur elle et en choisissant \"copier dans la conversation\" dans le menu contextuel."
 
 msgid "/closeall - close all whispers."
 msgstr "/closeall - fermer toutes les fenêtres de chuchotement."
@@ -572,8 +579,8 @@ msgstr "##2DROITE##P                    \"Aller à droite\""
 msgid "##2RightBracket(])##P          \"Copy Equiped to Outfit\""
 msgstr "##2CrochetDroit(])##P          \"Copier l'équipement porté dans les tenues\""
 
-msgid "/undress NICK - remove all clothes from nick. Local effect only."
-msgstr ""
+msgid "##2t##P                        \"Talk\""
+msgstr "##2t##P                        \"Parler\""
 
 msgid "##2n##P                        \"Target NPC\""
 msgstr "##2n##P                        \"Sélectionner le PNJ\""
@@ -600,10 +607,10 @@ msgid "You can change any key in keyboard settings."
 msgstr "Tu peux changer n'importe quelle touche dans la configuration du clavier."
 
 msgid "/dirs - show client dirs in debug chat tab."
-msgstr ""
+msgstr "/dirs - Liste les répertoires utilisés par le client dans l'onglet d'informationd de débogage."
 
 msgid "Powered By"
-msgstr ""
+msgstr "Motorisé par"
 
 msgid "/disconnect - quick disconnect from server."
 msgstr "/disconnect - déconnexion rapide du serveur."
@@ -612,7 +619,7 @@ msgid "/outfit N - wear outfit number N."
 msgstr "/outfit N - met la tenue numéro N."
 
 msgid "/disregard NICK - add nick to disregarded list."
-msgstr ""
+msgstr "/disregard NOM - ajouter NOM à la liste de négligés."
 
 msgid "##2F9##P                       \"Setup Window\""
 msgstr "##2F9##P                       \"Fenêtre de configuration\""
@@ -623,8 +630,8 @@ msgstr "##2F5##P                       \"Fenêtre de compétences\""
 msgid "Commands"
 msgstr "Commandes"
 
-msgid "##2t##P                        \"Talk\""
-msgstr "##2t##P                        \"Parler\""
+msgid "/undress NICK - remove all clothes from nick. Local effect only."
+msgstr "/undress NOM - Déshabiller complètement NOM. Effet local seulement."
 
 msgid ""
 " Otherwise see the @@team|Development Team@@ section to have a list of\n"
@@ -632,7 +639,7 @@ msgid ""
 msgstr "Sinon regarde la section @@team|Équipe de Développement@@ pour avoir la liste des développeurs et comment les contacter."
 
 msgid "##2Quote(')##P                 \"Set Direction Right\""
-msgstr ""
+msgstr "##2Apostrophe(')##P                 \"Se tourner vers a droite\""
 
 msgid "##2F4##P                       \"Equipment Window\""
 msgstr "##2F4##P                       \"Fenêtre d'équipement\""
@@ -647,16 +654,16 @@ msgstr "Si le client fonctionne très lentement, tu peux améliorer sa vitesse e
 
 msgid ""
 "/mail NICK MSG - send offline message to NICK. Working only in tmw server."
-msgstr ""
+msgstr "/mail NOM MSG - Envoyer un message a NOM alors qu'il est hors ligne. Fonctionne uniquement  sur le serveur tmw avec \"AuctionBot\"."
 
 msgid "##2k##P                        \"Set Direction Left\""
-msgstr ""
+msgstr "##2k##P                        \"Se tourner vers la gauche\""
 
 msgid ""
 " - ##2disregarded##P:  You wish to disregard this player, meaning that his or\n"
 "   her chat messages are not logged and trade requests and whispers are\n"
 "   ignored."
-msgstr ""
+msgstr " - ##2disregarded##P:  Vous voulez négliger ce joueur, ce qui signifie que ses\n   ses messages are ses messages n'apparaissent pas dans la conversation et que ses messages personnels et requêtes d'échange son ignorés."
 
 msgid "##2o##P                        \"Change Pickup Type\""
 msgstr "##2o##P                        \"Changer le type de ramassage\""
@@ -667,18 +674,13 @@ msgstr "##2Puissance 2(²)##P             \"Fenêtre des tenues\""
 msgid "##2Period(.)##P                \"Change Move to Target type\""
 msgstr "##2Deux-points(:)##P                \"Changer le type de déplacement vers les cibles\""
 
-msgid ""
-"About yellow bar you can read here:\n"
-"http://manaplus.evolonline.org/yellowbar"
-msgstr "A propos de la barre jaune tu peux lire ça :\nhttp://manaplus.evolonline.org/yellowbar"
-
 msgid "##2F10##P                      \"Debug Window\""
 msgstr "##2F10##P                      \"Fenêtre de déboguage\""
 
 msgid ""
 " - ##2allow trading##P: Do you wish to allow trade requests from arbitrary\n"
 "   players?"
-msgstr ""
+msgstr " - ##2allow trading##P: vulez vous accepter les demandes d'échange\n   de tous les joueurs?"
 
 msgid "Whispers commands"
 msgstr "Commandes de chuchotement"
@@ -690,7 +692,7 @@ msgid ""
 " Left click to execute default action: walk, pick up an item, attack a monster\n"
 " and talk to NPCs (be sure to click on their feet). Right click to show up a\n"
 " context menu. Holding [Left Shift] prevents from walking when attacking."
-msgstr ""
+msgstr " Clic gauche pour exécuter l'action par défaut: marcher, prendre un objet, attaquer un monstre\n et parler aux PNJs (cliquez sur leurs pieds). Clic droit pour développer\n un menu contextuel. Maintenir [Majuscule gauche] empêche de marcher pendant l'attaque."
 
 msgid ""
 "You can see other player equiped items,\n"
@@ -701,7 +703,7 @@ msgid "##2d##P                        \"Move to Home location\""
 msgstr "##2d##P                        \"Aller à l'emplacement de base\""
 
 msgid "Whispers"
-msgstr ""
+msgstr "Chuchotement-message personnel"
 
 msgid "##2LeftAlt + 0##P              \"Emote Shortcut 10\""
 msgstr "##2Alt-Gauche + 0##P              \"Raccourci Émoticône 10\""
@@ -712,7 +714,7 @@ msgstr "/help - affiche une courte aide à propos des commandes dans le chat."
 msgid ""
 "You can set any client resolution. In settings in video tab,\n"
 "click on \"custom\" and enter for example: 900x500 and press ok."
-msgstr ""
+msgstr "Vous pouvez choisir n'importe quelle résolution pour le client dans l'onglet \"video\" de la configuration,\nchoisir  \"personnalisé\" et entrez par example: 900x500 puis pressez ok."
 
 msgid "/attack - attack target."
 msgstr "/attack - attaque la cible."
@@ -724,7 +726,7 @@ msgid ""
 " You may find that not all communication is to your liking.  While most people\n"
 " are nice, some may offend you or try to make your life harder-- since this is\n"
 " an open game, there is nothing the developers can do to prevent this."
-msgstr ""
+msgstr "Il se peut que vous trouviez que toutes les communications ne vous conviennent pas.  Même si la plupart des joueurs sont\n sympathiques, quelques-uns pourraient vous offenser ou vous rendre la vie difficile.  Comme ceci est\n un jeu ouvert, les développeurs ne peuvent rien pur vous éviter ces mésaventures."
 
 msgid ""
 " However, you can protect yourself from such players by ignoring them.  Right-\n"
@@ -732,13 +734,13 @@ msgid ""
 " `Disregard' (see below).  You can fine-tune your player relations in the\n"
 " `Setup' menu, which lists all the players you have added to it.  To open this\n"
 " menu, select `Setup' in the upper right corner of the screen, then `Players'."
-msgstr ""
+msgstr " Pourtant, vous pouver vous protéger de tels joueurs en les ignorant.  Faites\n un clic-droit sur eux pour dérouler le menu contextuel, puis choisissez \"ignore\" ou\n  \"négliger\" (voir plus bas).  vous pourrez affiner vos choix de relations dans le menu \"configuration\", \n `onglet \"relations\", qui liste tous les joueurs que vous y avez ajouté.  Pour l'ouvrir\n pressez le bouton \"CFG\" du coin haut -droit de votre écran, puis l'onglet \"relations\"."
 
 msgid "##2KeyPad[9]##P                \"Next Chat Tab\""
-msgstr ""
+msgstr "##2KeyPad[9]##P                \"Onglet de conversation suivant\""
 
 msgid "##2KeyPad[7]##P                \"Previous chat tab line\""
-msgstr ""
+msgstr "##2KeyPad[7]##P                \"ligne de conversation précédente\""
 
 msgid "##2Trade:##P enables the ability to trade with others."
 msgstr "##2Echanger:##P active la possibilité d'échanger avec les autres."
@@ -756,16 +758,16 @@ msgid "##2b##P                        \"Use magic attack\""
 msgstr "##2b##P                        \"Lancer un sort\""
 
 msgid "##2KeyPad[4]##P                \"Change Imitation mode\""
-msgstr ""
+msgstr "##2KeyPad[4]##P                \"Changer de mode d'imitation\""
 
 msgid "##2Tab##P                      \"Emulate right click from keyboard\""
-msgstr ""
+msgstr "##2Tab##P                      \"Emuler le clic-droit depuis le clavier\""
 
 msgid "##2LeftBracket([)##P           \"Bot Checker Window\""
 msgstr "##2CrochetGauche([)##P           \"Fenêtre du testeur de robot\""
 
 msgid "##2l##P                        \"Set Direction Up\""
-msgstr ""
+msgstr "##2l##P                        \"Se tourner vers le haut\""
 
 msgid "/serverignoreall - ignore all whispers on server side."
 msgstr "/serverignoreall - ignorer tous les chuchotements du côté serveur."
@@ -774,7 +776,7 @@ msgid "##2v##P                        \"Move to Target\""
 msgstr "##2v##P                        \"Aller à la cible\""
 
 msgid "##2KeyPad[7]##P                \"Previous Chat Tab\""
-msgstr ""
+msgstr "##2KeyPad[7]##P                \"onglet de conversation précédent\""
 
 msgid ""
 "##2               SDL, SDL_image, SDL_mixer (Media framework)\n"
@@ -784,7 +786,7 @@ msgid ""
 "##2                          PhysFS (Data files)\n"
 "##2                        libcurl (HTTP downloads)\n"
 "##2                            zlib (Archives)"
-msgstr ""
+msgstr "##2               SDL, SDL_image, SDL_mixer (Media framework)\n##2                     SDL_net (Networking framework)\n##2                        Guichan (GUI framework)\n##2                   libxml2 (XML parsing and writing)\n##2                          PhysFS (Data files)\n##2                        libcurl (HTTP downloads)\n##2                            zlib (Archives)"
 
 msgid "##2h##P                        \"Hide Windows\""
 msgstr "##2h##P                        \"Cacher les fenêtres\""
@@ -807,13 +809,13 @@ msgid "/follow NICK - start follow mode."
 msgstr "/follow PSEUDO - suivre le joueur."
 
 msgid "/navigate x y - move to position x,y in current map in any distance."
-msgstr ""
+msgstr "/navigate x y - aller à la position x,y de la carte courante, à une distance quelconque."
 
 msgid "SKILLS"
 msgstr "COMPETENCES"
 
 msgid "Art or images contributors"
-msgstr ""
+msgstr " Contributeurs: artistes graphiques"
 
 msgid "##27##P                        \"Item Shortcut 7\""
 msgstr "##27##P                        \"Raccourci Objet 7\""
@@ -828,24 +830,18 @@ msgid "##2Insert##P                   \"Item Shortcut 14\""
 msgstr "##2Inser##P                   \"Raccourci Objet 14\""
 
 msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
-msgstr ""
+"About yellow bar you can read here:\n"
+"http://manaplus.evolonline.org/yellowbar"
+msgstr "A propos de la barre jaune tu peux lire ça :\nhttp://manaplus.evolonline.org/yellowbar"
 
 msgid "##2F6##P                       \"Minimap Window\""
 msgstr "##2F6##P                       \"Fenêtre de mini-carte\""
 
-msgid ""
-" Currently only stackable items like food, but not weapons or clothes can be\n"
-" used with the shortcut window."
-msgstr ""
-
 msgid "##2c##P                        \"Quick heal target or self\""
 msgstr "##2c##P                        \"Soins rapides de la cible ou de soi\""
 
 msgid "##2KeyPad[5]##P                \"Set home location/Set arrow\""
-msgstr ""
+msgstr "##2KeyPad[5]##P                \"définir la position par défaut/Marquer un repère de navigation\""
 
 msgid "##26##P                        \"Item Shortcut 6\""
 msgstr "##26##P                        \"Raccourci Objet 6\""
diff --git a/data/translations/help/pl.po b/data/translations/help/pl.po
index 2c881e785..840825619 100644
--- a/data/translations/help/pl.po
+++ b/data/translations/help/pl.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-03-19 07:06+0000\n"
-"Last-Translator: derpella <matwa@poczta.pl>\n"
+"PO-Revision-Date: 2012-04-28 13:10+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +34,10 @@ msgstr "Tłumacze"
 msgid "##2Esc##P                      \"Quit\""
 msgstr ""
 
-msgid "##2m##P                        \"Use #itenplz spell\""
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
 msgstr ""
 
 msgid "##2KeyPad[3]##P                \"On / Off audio\""
@@ -53,6 +56,12 @@ msgid "KEYBOARD:"
 msgstr "KLAWIATURA"
 
 msgid ""
+" If you're having troubles, please first of all read the FAQ. If you\n"
+" can't find a solution to your problem, feel free to check our\n"
+" Bugs/Support section of the forum:"
+msgstr ""
+
+msgid ""
 "##2     http://forums.themanaworld.org/viewforum.php?f=3\n"
 " or visit IRC channel:"
 msgstr ""
@@ -95,11 +104,7 @@ msgid ""
 "   private messages to you in-game?"
 msgstr ""
 
-msgid ""
-"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
-" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making\n"
-" sure this game can't ever run away from you."
+msgid "##PMagic skills can be obtain by doing quests and missions in game."
 msgstr ""
 
 msgid "Support"
@@ -108,7 +113,7 @@ msgstr ""
 msgid "##2z##P                        \"Pickup\""
 msgstr ""
 
-msgid "##PMagic skills can be obtain by doing quests and missions in game."
+msgid "##2m##P                        \"Use #itenplz spell\""
 msgstr ""
 
 msgid ""
@@ -442,6 +447,13 @@ msgid "##2RightControl##P             \"Wear Outfit\""
 msgstr ""
 
 msgid ""
+"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
+" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
+" sure this game can't ever run away from you."
+msgstr ""
+
+msgid ""
 "You can buy or sell items from players shops.\n"
 "Right click on player and select \"Buy\" or \"Sell\""
 msgstr ""
@@ -460,12 +472,6 @@ msgid ""
 " Added many features, improved perfomance, stability, security and more."
 msgstr ""
 
-msgid ""
-" If you're having troubles, please first of all read the FAQ. If you\n"
-" can't find a solution to your problem, feel free to check our\n"
-" Bugs/Support section of the forum:"
-msgstr ""
-
 msgid "##2SpaceBar##P                 \"Select OK\""
 msgstr ""
 
@@ -572,7 +578,7 @@ msgstr ""
 msgid "##2RightBracket(])##P          \"Copy Equiped to Outfit\""
 msgstr ""
 
-msgid "/undress NICK - remove all clothes from nick. Local effect only."
+msgid "##2t##P                        \"Talk\""
 msgstr ""
 
 msgid "##2n##P                        \"Target NPC\""
@@ -623,7 +629,7 @@ msgstr ""
 msgid "Commands"
 msgstr ""
 
-msgid "##2t##P                        \"Talk\""
+msgid "/undress NICK - remove all clothes from nick. Local effect only."
 msgstr ""
 
 msgid ""
@@ -667,11 +673,6 @@ msgstr ""
 msgid "##2Period(.)##P                \"Change Move to Target type\""
 msgstr ""
 
-msgid ""
-"About yellow bar you can read here:\n"
-"http://manaplus.evolonline.org/yellowbar"
-msgstr ""
-
 msgid "##2F10##P                      \"Debug Window\""
 msgstr ""
 
@@ -828,19 +829,13 @@ msgid "##2Insert##P                   \"Item Shortcut 14\""
 msgstr ""
 
 msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
+"About yellow bar you can read here:\n"
+"http://manaplus.evolonline.org/yellowbar"
 msgstr ""
 
 msgid "##2F6##P                       \"Minimap Window\""
 msgstr ""
 
-msgid ""
-" Currently only stackable items like food, but not weapons or clothes can be\n"
-" used with the shortcut window."
-msgstr ""
-
 msgid "##2c##P                        \"Quick heal target or self\""
 msgstr ""
 
diff --git a/data/translations/help/pt_BR.po b/data/translations/help/pt_BR.po
index bda1f4407..53b13763e 100644
--- a/data/translations/help/pt_BR.po
+++ b/data/translations/help/pt_BR.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-04-14 18:43+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"PO-Revision-Date: 2012-04-28 13:10+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/manaplus/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,8 +34,11 @@ msgstr "Tradutores"
 msgid "##2Esc##P                      \"Quit\""
 msgstr "##2Esc##P                      \"Saída\""
 
-msgid "##2m##P                        \"Use #itenplz spell\""
-msgstr "##2m##P                        \"Utiliza o feitiço #itenplz\""
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
+msgstr ""
 
 msgid "##2KeyPad[3]##P                \"On / Off audio\""
 msgstr "##2KeyPad[3]##P                \"Liga / Desliga áudio\""
@@ -53,6 +56,12 @@ msgid "KEYBOARD:"
 msgstr "TECLADO:"
 
 msgid ""
+" If you're having troubles, please first of all read the FAQ. If you\n"
+" can't find a solution to your problem, feel free to check our\n"
+" Bugs/Support section of the forum:"
+msgstr ""
+
+msgid ""
 "##2     http://forums.themanaworld.org/viewforum.php?f=3\n"
 " or visit IRC channel:"
 msgstr "##2     http://forums.themanaworld.org/viewforum.php?f=3\n ou visite o canal IRC:"
@@ -95,12 +104,8 @@ msgid ""
 "   private messages to you in-game?"
 msgstr " - ##2allow whispers##P: Você deseja permiti que os jogadores arbitrários enviem mensagens privadas a você no jogo?"
 
-msgid ""
-"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
-" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making\n"
-" sure this game can't ever run away from you."
-msgstr "##2ManaPlus##P é um serio esforço para criar um inovado, grátis e de código aberto cliente MMORPG. Mana utiliza gráficos 2D e foca em criar um largo e diverso mundo interativo. É licenciado sobre licença GPL. Tendo certeza que o jogo jamais te abandonará; "
+msgid "##PMagic skills can be obtain by doing quests and missions in game."
+msgstr "##PHabilidades mágicas podem ser obtidas fazendo quests ou missões no jogo."
 
 msgid "Support"
 msgstr "Suporte"
@@ -108,8 +113,8 @@ msgstr "Suporte"
 msgid "##2z##P                        \"Pickup\""
 msgstr "##2z##P                        \"Pegar no chão\""
 
-msgid "##PMagic skills can be obtain by doing quests and missions in game."
-msgstr "##PHabilidades mágicas podem ser obtidas fazendo quests ou missões no jogo."
+msgid "##2m##P                        \"Use #itenplz spell\""
+msgstr "##2m##P                        \"Utiliza o feitiço #itenplz\""
 
 msgid ""
 "Communication is often essential to success in this game. You can communicate\n"
@@ -442,6 +447,13 @@ msgid "##2RightControl##P             \"Wear Outfit\""
 msgstr "##2RightControl##P             \"Vestir Roupas\""
 
 msgid ""
+"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
+" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
+" sure this game can't ever run away from you."
+msgstr ""
+
+msgid ""
 "You can buy or sell items from players shops.\n"
 "Right click on player and select \"Buy\" or \"Sell\""
 msgstr "Você pode comprar ou vender itens em lojas de jogadores. Botão direito do mouse no player e selecione \"Comprar\" ou \"Vender\""
@@ -460,12 +472,6 @@ msgid ""
 " Added many features, improved perfomance, stability, security and more."
 msgstr "##2Manaplus##P é uma extensão baseada no código do cliente ##2Mana##P.\nAdicionado muitos recursos, melhorado a performance, estabilidade, segurança e muito mais."
 
-msgid ""
-" If you're having troubles, please first of all read the FAQ. If you\n"
-" can't find a solution to your problem, feel free to check our\n"
-" Bugs/Support section of the forum:"
-msgstr "Se você está tendo problemas, por favor, antes de tudo, leia o FAQ. Se você não encontrar uma solução para seu problema, sinta-se livre para verificar a nossa seção de Erros no suporte do fórum:"
-
 msgid "##2SpaceBar##P                 \"Select OK\""
 msgstr "##2Barra de espaçor##P                 \"Seleciona OK\""
 
@@ -572,7 +578,7 @@ msgstr ""
 msgid "##2RightBracket(])##P          \"Copy Equiped to Outfit\""
 msgstr ""
 
-msgid "/undress NICK - remove all clothes from nick. Local effect only."
+msgid "##2t##P                        \"Talk\""
 msgstr ""
 
 msgid "##2n##P                        \"Target NPC\""
@@ -623,7 +629,7 @@ msgstr ""
 msgid "Commands"
 msgstr ""
 
-msgid "##2t##P                        \"Talk\""
+msgid "/undress NICK - remove all clothes from nick. Local effect only."
 msgstr ""
 
 msgid ""
@@ -667,11 +673,6 @@ msgstr ""
 msgid "##2Period(.)##P                \"Change Move to Target type\""
 msgstr ""
 
-msgid ""
-"About yellow bar you can read here:\n"
-"http://manaplus.evolonline.org/yellowbar"
-msgstr ""
-
 msgid "##2F10##P                      \"Debug Window\""
 msgstr ""
 
@@ -828,19 +829,13 @@ msgid "##2Insert##P                   \"Item Shortcut 14\""
 msgstr ""
 
 msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
+"About yellow bar you can read here:\n"
+"http://manaplus.evolonline.org/yellowbar"
 msgstr ""
 
 msgid "##2F6##P                       \"Minimap Window\""
 msgstr ""
 
-msgid ""
-" Currently only stackable items like food, but not weapons or clothes can be\n"
-" used with the shortcut window."
-msgstr ""
-
 msgid "##2c##P                        \"Quick heal target or self\""
 msgstr ""
 
diff --git a/data/translations/help/ru.po b/data/translations/help/ru.po
index 91b89dde2..f5f07d641 100644
--- a/data/translations/help/ru.po
+++ b/data/translations/help/ru.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-03-29 09:46+0000\n"
-"Last-Translator: Dan Sagunov <danilka.pro@gmail.com>\n"
+"PO-Revision-Date: 2012-04-28 13:10+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +35,10 @@ msgstr "Переводчики"
 msgid "##2Esc##P                      \"Quit\""
 msgstr ""
 
-msgid "##2m##P                        \"Use #itenplz spell\""
+msgid ""
+"Most commands working in whispers.\n"
+"For example command /imitation in whisper with nick1,\n"
+" similar to command /imitation nick1."
 msgstr ""
 
 msgid "##2KeyPad[3]##P                \"On / Off audio\""
@@ -54,6 +57,12 @@ msgid "KEYBOARD:"
 msgstr "КЛАВИАТУРА:"
 
 msgid ""
+" If you're having troubles, please first of all read the FAQ. If you\n"
+" can't find a solution to your problem, feel free to check our\n"
+" Bugs/Support section of the forum:"
+msgstr ""
+
+msgid ""
 "##2     http://forums.themanaworld.org/viewforum.php?f=3\n"
 " or visit IRC channel:"
 msgstr ""
@@ -96,11 +105,7 @@ msgid ""
 "   private messages to you in-game?"
 msgstr ""
 
-msgid ""
-"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
-" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
-" and diverse interactive world. It is licensed under the GPL, making\n"
-" sure this game can't ever run away from you."
+msgid "##PMagic skills can be obtain by doing quests and missions in game."
 msgstr ""
 
 msgid "Support"
@@ -109,7 +114,7 @@ msgstr "Поддержка"
 msgid "##2z##P                        \"Pickup\""
 msgstr ""
 
-msgid "##PMagic skills can be obtain by doing quests and missions in game."
+msgid "##2m##P                        \"Use #itenplz spell\""
 msgstr ""
 
 msgid ""
@@ -443,6 +448,13 @@ msgid "##2RightControl##P             \"Wear Outfit\""
 msgstr ""
 
 msgid ""
+"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
+" source MMORPG Client. Mana uses 2D graphics and aims to create a large\n"
+" and diverse interactive world. It is licensed under the GPL, making\n"
+" sure this game can't ever run away from you."
+msgstr ""
+
+msgid ""
 "You can buy or sell items from players shops.\n"
 "Right click on player and select \"Buy\" or \"Sell\""
 msgstr ""
@@ -461,12 +473,6 @@ msgid ""
 " Added many features, improved perfomance, stability, security and more."
 msgstr "##2ManaPlus##P - расширенный клиент для которого за основу взят ##2Mana##P клиент.\n Добавлено множество возможностей, улучшина производительность,\nстабильность, безопасность и многое другое."
 
-msgid ""
-" If you're having troubles, please first of all read the FAQ. If you\n"
-" can't find a solution to your problem, feel free to check our\n"
-" Bugs/Support section of the forum:"
-msgstr ""
-
 msgid "##2SpaceBar##P                 \"Select OK\""
 msgstr ""
 
@@ -573,7 +579,7 @@ msgstr ""
 msgid "##2RightBracket(])##P          \"Copy Equiped to Outfit\""
 msgstr ""
 
-msgid "/undress NICK - remove all clothes from nick. Local effect only."
+msgid "##2t##P                        \"Talk\""
 msgstr ""
 
 msgid "##2n##P                        \"Target NPC\""
@@ -624,7 +630,7 @@ msgstr ""
 msgid "Commands"
 msgstr "Команды"
 
-msgid "##2t##P                        \"Talk\""
+msgid "/undress NICK - remove all clothes from nick. Local effect only."
 msgstr ""
 
 msgid ""
@@ -668,11 +674,6 @@ msgstr ""
 msgid "##2Period(.)##P                \"Change Move to Target type\""
 msgstr ""
 
-msgid ""
-"About yellow bar you can read here:\n"
-"http://manaplus.evolonline.org/yellowbar"
-msgstr "О желтой полосе с настройками можно прочитать здесь:\nhttp://manaplus.evolonline.org/yellowbar"
-
 msgid "##2F10##P                      \"Debug Window\""
 msgstr ""
 
@@ -829,19 +830,13 @@ msgid "##2Insert##P                   \"Item Shortcut 14\""
 msgstr ""
 
 msgid ""
-"Most commands working in whispers.\n"
-"For example command /imitation in whisper with nick1,\n"
-" similar to command /imitation nick1."
-msgstr ""
+"About yellow bar you can read here:\n"
+"http://manaplus.evolonline.org/yellowbar"
+msgstr "О желтой полосе с настройками можно прочитать здесь:\nhttp://manaplus.evolonline.org/yellowbar"
 
 msgid "##2F6##P                       \"Minimap Window\""
 msgstr ""
 
-msgid ""
-" Currently only stackable items like food, but not weapons or clothes can be\n"
-" used with the shortcut window."
-msgstr ""
-
 msgid "##2c##P                        \"Quick heal target or self\""
 msgstr ""
 
diff --git a/po/ar.po b/po/ar.po
index a500c051f..b35fadddd 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "تثبيت"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "مرئية"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "خطأ"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -347,35 +347,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -409,20 +409,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -435,8 +435,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "شراء"
 
@@ -480,14 +480,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "بيع"
 
@@ -495,18 +494,18 @@ msgstr "بيع"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -612,7 +611,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "إنشاء"
 
@@ -627,7 +626,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -783,7 +782,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -796,13 +795,9 @@ msgstr "نعم"
 msgid "No"
 msgstr "لا"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -967,7 +962,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -1013,13 +1008,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "العتاد"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
@@ -1047,7 +1042,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "الجردة"
@@ -1061,31 +1056,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "استعمال العتاد"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "استخدام"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "قسم"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1094,18 +1089,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "إسقاط"
 
@@ -1154,7 +1149,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1358,11 +1353,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1384,7 +1379,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1397,362 +1392,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "تبديل الخادوم"
@@ -2375,11 +2338,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2802,158 +2765,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3477,7 +3452,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "مهارات"
 
@@ -3556,175 +3531,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4281,79 +4268,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "الحالة"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4369,7 +4356,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4391,7 +4378,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4403,42 +4390,42 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4449,300 +4436,300 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5417,36 +5404,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -6000,15 +5987,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 3f431b199..c04424427 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -475,18 +474,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr ""
 
@@ -607,7 +606,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -776,13 +775,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 9cdde2f87..ec0d34842 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -475,18 +474,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr ""
 
@@ -607,7 +606,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -776,13 +775,9 @@ msgstr "si"
 msgid "No"
 msgstr "no"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index f61921cac..43cf8f427 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/language/"
 "cs/)\n"
@@ -29,7 +29,7 @@ msgstr "Ignorovat příchozí žádosti o obchodování"
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
@@ -46,56 +46,56 @@ msgid "miss"
 msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Výkon"
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Požaduji postavy"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Zaměňuji herní servery"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -105,50 +105,50 @@ msgstr "Zaměňuji herní servery"
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Změna hesla"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Změna emailu"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Neplatný host updatů: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
@@ -337,35 +337,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Snímky obrazovky ukládat jako "
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "Nelze načíst mapu"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
@@ -399,20 +399,20 @@ msgid "Name"
 msgstr "Jméno"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Útok"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Mluvit"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -425,8 +425,8 @@ msgid "Reset"
 msgstr "Vynulovat"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Nákup"
 
@@ -470,14 +470,13 @@ msgid "Max"
 msgstr "Vše"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Obchod"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Prodej"
 
@@ -485,18 +484,18 @@ msgstr "Prodej"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -602,7 +601,7 @@ msgid "Race:"
 msgstr "Rasa:"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -617,7 +616,7 @@ msgstr "Žena"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Ostatní"
 
@@ -786,13 +785,9 @@ msgstr "Ano"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Ignorovat"
 
@@ -957,7 +952,7 @@ msgstr "Víte že ... ?"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zavřít"
 
@@ -1003,13 +998,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Vybavení"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Odstranit z vybavení"
 
@@ -1037,7 +1032,7 @@ msgstr "dle množství"
 msgid "by type"
 msgstr "dle typu"
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventář"
@@ -1051,31 +1046,31 @@ msgid "Filter:"
 msgstr "Filtr:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Vybavit"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Použít"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Upustit..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Rozdělit"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Výstroje"
 
@@ -1084,18 +1079,18 @@ msgid "Weight:"
 msgstr "Hmotnost:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Uložit"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Vzít"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Upustit"
 
@@ -1144,7 +1139,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr "Váha: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Statistiky zabíjení"
 
@@ -1342,11 +1337,11 @@ msgid "Submit"
 msgstr "Odeslat"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Vyprázdnit"
 
@@ -1368,7 +1363,7 @@ msgid "Outfit: %d"
 msgstr "Výstroj: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Klávesa: %s"
@@ -1381,362 +1376,330 @@ msgstr "Nejdřív odstrojit"
 msgid "Away outfit"
 msgstr "Výstroj pro \"Away\""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Obchod"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "Šeptat"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "Vyléčit"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "Být přátelé"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr "Přehlížet"
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "Vymazat"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr "Odignorovat"
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "Kompletně ignorovat"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "Následovat"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "imitovat"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr "Pozvat do party"
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "Vykopnout z party"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "Vykopnout z gildy"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr "Změnit pozici v gildě"
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr "Pozvat do gildy"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "Vykopnout hráče"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "Zobrazit věci"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "Svléct"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "Přidat komentář"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "Koupit (?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "Prodat (?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "Vykopnout"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr "Vložit jméno do chatu"
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Hráči"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "Vykopnout z party"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Sebrat"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Vložit do chatu"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Označit na mapě"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "Odebrat"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Kouzla"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "Načíst stará kouzla"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "Upravit kouzlo"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "vypnout zvýrazǒvání"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Zapnout zvýrazňování"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr "Neodebírat jméno"
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "Odebrat jméno"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "Zapnout \"away\""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr "Vypnout \"away\""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "Odejít"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr "Pozvat do party"
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Přejmenovat značku an mapě"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Jméno:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "Hráčův komentář"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "Komentář:                      "
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr "Přidat do transakce"
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr "Přidat 10 do transakce"
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr "Přidat polovinu do transakce"
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Přidat vše do transakce"
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Uschovat 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Uschovat všechny"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "Upustit vše"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Vzít polovinu"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Načíst staré zkratky věcí"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Skrýt"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Zobrazit"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "Posunout nahoru"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "Posunout dolů"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "Svléct"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "Být přátelé"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr "Přehlížet"
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "Vymazat"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr "Odignorovat"
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "Kompletně ignorovat"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "Následovat"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "imitovat"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "Koupit (?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "Prodat (?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "Zobrazit věci"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Přepnout server"
@@ -2359,11 +2322,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "Zkratky"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2788,158 +2751,170 @@ msgid "Attack while moving"
 msgstr "Útočit během pohybu"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "Synchronizovat hráčův pohyb"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "Program A šílených pohybů"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "hráč"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "Zobrazit vlastní pruh životů"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "Zapnout rychlé statistiky"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "Cyklovat zamířené hráče"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "Zobrazovat zprávy o pracovních exp"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "Zobrazovat popupy o hráčích"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr "Away zpráva"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "Zobrazit práci"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Akceptovat požadavky na koupi/prodej"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "Zapnout mód obchodu"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "Zaznamenávat dialogy s NPC"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr "Podpora botů"
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr "Zapnout podporu AuctionBot-a"
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Zapnout podporu guild bota a vypnout nativní podporu gild"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Zapnout ověřovač botů"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "Zapnout debug záznam"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "Mód nízké síťvé náročnosti"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr "Skrýt zobrazení štítu"
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Zobrazit pozadí"
 
@@ -3466,7 +3441,7 @@ msgstr "Požadavek k obchodování"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s %s příjímáte?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Dovednosti"
 
@@ -3545,175 +3520,190 @@ msgstr "Opustit gildu?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Jste si jisti že chcete opustit gildu %s?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Parta"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr "Prioritní monstra"
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "Útočit na monstra"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr "Ignorovat monstra"
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "Vytvořit gildu"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "Vytvořit partu"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Společenství"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "Pozvat"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijato pozvání do party od %s."
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnuto přijetí do party od %s."
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijato pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnuto pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Vytvářím gildu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "Vytvářím partu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "Název gildy"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "Zvolte jméno vaší gildy."
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje."
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vás zve ke vstupu do gildy %s."
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "Přílmout pozvání do gildy"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "Byli jste pozváni k připojení se do party."
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Byli jste pozváni k připojení se do party %s."
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vás pozval ke vstupu do své party."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s."
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 msgid "Cannot create party. You are already in a party"
 msgstr "Nemohu vytvořit partu. Již jste členem party."
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr "Jméno party"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4268,79 +4258,79 @@ msgstr ""
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "Ověřovač botů"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "Kdo je online"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "Smajlíci"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "Víte že"
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4356,7 +4346,7 @@ msgstr "Změň přihlášení"
 msgid "Choose World"
 msgstr "vyber svět"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4378,7 +4368,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4390,42 +4380,42 @@ msgstr "Úložiště"
 msgid "Cart"
 msgstr "Košík"
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4433,300 +4423,300 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) výchozí pohyby"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr "(I) invertované pohyby"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr "(c) pohyby s trochou šílených pohybů"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr "(C) pohyby s šílenými pohyby"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) dvojité normální + šílené"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr "(a) vlastní šílené pohyby"
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr "(?) šílené pohyby"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr "(0) výchozí pohyb k cíli"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr "(1) pohyb k cíli do vzdálenosti 1"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) pohyb k cíli do vzdálenosti 2"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr "(3) pohyb k cíli do vzdálenosti 3"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr "(5) pohyb k cíli do vzdálenosti 5"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr "(7) pohyb k cíli do vzdálenosti 7"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr "(A) pohyb k cíli na útočný dosah"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?) pohyb k cíli"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr "(D) výchozí následování"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr "(R) relativní následování"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr "(M) zrcadlené následování"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr "(?) neznámé následování"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) útok"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) výchozí útok"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) přepínat útok bez štítu"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S) přepínat útok se štítem"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) jdi a útoč"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) jdi, útoč, sbírej"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) bez automatického útoku"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) malý sběr 1x1 pole"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) výchozí sběr 2x1 pole"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) sběr před 2x3 pole"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) sběr 3x3 pole"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) jdi a seber do vzdálenosti 4"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) jdi a seber do vzdálenosti 8"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr "(A) jdi a seber do max. vzdálenosti"
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?) sběr"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) Normální zobrazení mapy"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr "(D) debug zobrazení mapy"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr "(u) ultra zobrazení mapy"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra zobrazení mapy 2"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) zobrazen prázdné mapy"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b) zobrazení černobílé mapy"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) použij #flar pro magický útok"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) použij #chiza pro magický útok"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) použij #ingrav pro magický útok"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) použij #frillyar pro magický útok"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) použij #upmarmu pro magický útok"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) magický útok attack"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr "(D) výchozí imitace"
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr "(O) imitace výstroje"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr "(?) imitace"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) u počítače"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) pryč (away)"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) away"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr "(G) mód herní kamery"
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr "(F) mód volné kamery"
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr "Modifikátory hry jsou zapnuty"
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr "Modifikátory hry jsou vypnuty"
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr "Vidíte "
 
@@ -5991,15 +5981,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 02f289348..36388fb7b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/manaplus/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Ignorerer indkomne handels anmodninger"
 msgid "Accepting incoming trade requests"
 msgstr "Accepterer indkomne handels anmodninger"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -44,56 +44,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Opsætning"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Forbinder til server"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Logger ind"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -103,50 +103,50 @@ msgstr ""
 msgid "Error"
 msgstr "Fejl"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -328,35 +328,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Netværksfejl"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunne ikke loade %s."
@@ -390,20 +390,20 @@ msgid "Name"
 msgstr "Navn"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Angrib"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Snak"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -416,8 +416,8 @@ msgid "Reset"
 msgstr "Nulstil"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Køb"
 
@@ -461,14 +461,13 @@ msgid "Max"
 msgstr "Maks"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "butik"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Sælg"
 
@@ -476,18 +475,18 @@ msgstr "Sælg"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -593,7 +592,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "Opret"
 
@@ -608,7 +607,7 @@ msgstr "Kvinde"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -764,7 +763,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til %s: %s"
@@ -777,13 +776,9 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -948,7 +943,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Luk"
 
@@ -994,13 +989,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Udstyr"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Tag af"
 
@@ -1028,7 +1023,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventarliste"
@@ -1042,31 +1037,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Tag på"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Brug"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Opdel"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1075,18 +1070,18 @@ msgid "Weight:"
 msgstr "Vægt:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Gem på lager"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Smid"
 
@@ -1135,7 +1130,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1331,11 +1326,11 @@ msgid "Submit"
 msgstr "Send forespørgsel"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1357,7 +1352,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1370,362 +1365,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handl"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Brugere"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Skift server"
@@ -2348,11 +2311,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2775,158 +2738,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3450,7 +3425,7 @@ msgstr "Anmodning om byttehandel."
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Færdigheder"
 
@@ -3529,175 +3504,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har inviteret med i sin gruppe"
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, 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:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr "Accepter invitationen"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4254,79 +4241,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4342,7 +4329,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4364,7 +4351,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4376,342 +4363,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5386,36 +5373,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5969,15 +5956,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index a43178b9f..50ee79c63 100644
--- a/po/de.po
+++ b/po/de.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/language/"
 "de/)\n"
@@ -35,7 +35,7 @@ msgstr "Ignoriere eingehende Handelsanfragen"
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "Sichtbar auf der Karte"
 
@@ -52,56 +52,56 @@ msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Leistung"
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr "Themen"
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -111,50 +111,50 @@ msgstr "Charakterserver wechseln"
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Passwort ändern"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -340,35 +340,35 @@ 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:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Allgemein"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Bildschirmfoto gespeichert unter "
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden."
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -402,20 +402,20 @@ msgid "Name"
 msgstr "Name"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Angriff"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Sprechen"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Bewegen"
 
@@ -428,8 +428,8 @@ msgid "Reset"
 msgstr "Zurücksetzten"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -473,14 +473,13 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Laden"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Verkaufen"
 
@@ -488,18 +487,18 @@ msgstr "Verkaufen"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -605,7 +604,7 @@ msgid "Race:"
 msgstr "Rasse:"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "Erstellen"
 
@@ -620,7 +619,7 @@ msgstr "Weiblich"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Sonstig"
 
@@ -789,13 +788,9 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Ignorieren"
 
@@ -869,7 +864,7 @@ msgstr "%d FPS"
 #: src/gui/debugwindow.cpp:179 src/gui/debugwindow.cpp:265
 #, c-format
 msgid "%d LPS"
-msgstr ""
+msgstr "%d LPS"
 
 #: src/gui/debugwindow.cpp:192 src/gui/debugwindow.cpp:244
 msgid "Textures count:"
@@ -960,7 +955,7 @@ msgstr "Wusstest du schon?"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Schließen"
 
@@ -1006,13 +1001,13 @@ msgstr "Beschreibung:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Ausrüstung"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -1040,7 +1035,7 @@ msgstr "nach Anzahl"
 msgid "by type"
 msgstr "nach Art"
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventar"
@@ -1054,31 +1049,31 @@ msgid "Filter:"
 msgstr "Filter:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Benutzen"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Aufteilen"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Ausrüstung"
 
@@ -1087,18 +1082,18 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Aufbewahren"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Wegwerfen"
 
@@ -1147,7 +1142,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Besiegte Gegner Statistik"
 
@@ -1345,11 +1340,11 @@ msgid "Submit"
 msgstr "Absenden"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Leeren"
 
@@ -1371,7 +1366,7 @@ msgid "Outfit: %d"
 msgstr "Ausrüstung: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Taste: %s"
@@ -1384,362 +1379,330 @@ msgstr "Zuerst ausziehen"
 msgid "Away outfit"
 msgstr "Abwesend-Outfit"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handeln"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "Flüstern"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "Heilen"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "Befreunden"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr "Missachten"
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr "Schwarze Liste"
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr "Als Feind setzen"
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "Löschen"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr "Nicht mehr Ignorieren"
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "Ignoriere komplett"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "Folgen"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "Imitation"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr "Lade zu Gruppe ein"
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "Aus Gruppe werfen"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "Aus Gilde werfen"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr "Rang in Gilde ändern"
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr "In Gilde einladen"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "Spieler rauswerfen"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr "Atombombe"
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "Zeige Items"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "Ausziehen"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "Kaufen(?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "Verkaufen(?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "Rauswerfen"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr "Entferne aus Angriffsliste"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr "Hinzufügen zur bevorzugten Angriffsliste"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr "Hinzufügen zur normalen Angriffsliste"
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr "Hinzufügen zur Ignorierenliste"
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr "Füge Name dem Chat hinzu"
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Spieler"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "Aus Gruppe werfen"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Aufheben"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Karteneinstellung"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr "Warp"
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr "Bewege Kamera"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr "Leere Ausrüstungsfenster"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Zaubersprüche"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "Lade alte Zaubersprüche"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "Bearbeite Zauberspruch"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "Hervorhebung abschalten"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Hervorhebung einschalten"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr "Lösche den Namen nicht"
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "Lösche Name"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "Aktiviere abwesend"
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr "Deaktiviere abwesend"
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "Verlassen"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr "Kopiere in die Zwischenablage"
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr "Lade zu Gruppe ein"
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Name:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "Spieler Kommentar"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "Kommentar:"
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr "Zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr "10 zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr "Die Hälfte zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Alles zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Die Hälfte aufbewahren"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "Alles fallenlassen"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Die Hälfte abholen"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Lade alte Tastenkombinationen für Objekte"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr "Fächer des Wegwerffensters leeren"
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Verstecken"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Zeigen"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr "Setze gelben Balken zurück"
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Kopiere zu Chat"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(normal)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "Nach oben"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "Nach unten"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "Ausziehen"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "Befreunden"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr "Missachten"
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr "Schwarze Liste"
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr "Als Feind setzen"
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "Löschen"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr "Nicht mehr Ignorieren"
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "Ignoriere komplett"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "Folgen"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "Imitation"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "Kaufen(?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "Verkaufen(?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "Zeige Items"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Server wechseln"
@@ -2362,11 +2325,11 @@ msgstr "Mod"
 msgid "Basic"
 msgstr "Normal"
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "Tastenkürzel"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr "Fenster"
 
@@ -2791,158 +2754,170 @@ msgid "Attack while moving"
 msgstr "Während des Bewegens angreifen"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "Synchronisiere Bewegungen des Spielers"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "Verrückte Bewegungen A-Programm"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "Spieler"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "Eigenen HP-Balken anzeigen"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "Aktiviere schnelleres Aufwerten der Spielerattribute"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "Angriffsziele des Spielers einkreisen"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "Zeige \"job exp\"-Nachrichten"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "Zeige Spieler-Popups"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr "Abwesend Nachricht"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "Zeige Job"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr "Aktiviere Angriffsfilter"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:143
 msgid "Enable advert protocol"
 msgstr "Aktiviere angezeigtes Protokoll"
 
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Verkauf- und Kaufanfragen akzeptieren"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "Laden-Modus einschalten"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "Protokolliere NPC Dialoge"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr "Bot Unterstützung"
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr "Aktiviere Auktion-Bot Unterstützung"
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Erlaube Gilden-Bot und deaktiviere nativen Gilden-Support"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
-msgstr ""
+msgstr "Tastatur"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
-msgstr ""
+msgstr "Wiederholverzögerung"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
-msgstr ""
+msgstr "Wiederholungszeitraum"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr "Immer zeigen"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr "Automatisch ausblenden bei kleiner Auflösung"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr "Immer Automatisch ausblenden"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr "Kurzwahltasten"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr "Proxy Server"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr "System proxy"
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr "Direkte Verbindung"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 hostname"
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr "Proxy type"
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr "Proxy address:port"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr "Aktiviere Angriff trotz Verzögerung"
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Botprüfer einschalten"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Aktiviere Schutz bei fehlerhaften-Servern (nicht deaktivieren)"
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "Debug-Protokoll benutzen"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "Niedriger Datenverkehr Modus"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr "Zeige das Schild nicht an"
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Benutze FBO für Bildschirmfotos (nur für openGL)"
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Zeige Hintergrund"
 
@@ -2998,14 +2973,16 @@ msgstr "Deaktiviere Wesens-Cache (Software)"
 #: src/gui/setup_perfomance.cpp:93
 msgid "Different options (enable or disable can improve perfomance)"
 msgstr ""
+"Verschiedene Optionen (aktiviert oder deaktiviert kann die Perfomance "
+"verbessern)"
 
 #: src/gui/setup_perfomance.cpp:96
 msgid "Enable texture compression (fast OpenGL)"
-msgstr ""
+msgstr "Aktivierung der Textur-Komprimierung (schnelles OpenGL)"
 
 #: src/gui/setup_perfomance.cpp:99
 msgid "Enable rectangular texture extension (OpenGL)"
-msgstr ""
+msgstr "Aktivierung der rechteckigen Textur-Erweiterung (OpenGL)"
 
 #: src/gui/setup_players.cpp:53
 msgid "Show gender"
@@ -3475,7 +3452,7 @@ msgstr "Erbitte einen Handel"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s möchte %s %s akzeptierst du?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Fähigkeiten"
 
@@ -3554,176 +3531,191 @@ msgstr "Gilde verlassen?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bist du sicher, dass du die Gilde %s verlassen willst?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "%s zur Gruppe einladen."
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Gruppe %s Auflösung beauftragt."
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr "Lade Mitglied in die Gruppe ein."
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wen willst du zur Gruppe %s einladen?"
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "Gruppe verlassen?"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bist du sicher, dass du die Gruppe %s verlassen willst?"
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr "Atk"
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr "Bevorzugte Monster"
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "Greife Monster an"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr "Ignoriere Monster"
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "Gruppe erstellen"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Sozial"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr "F"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Gruppeneinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Gruppeneinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Gildeneinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Gildeneinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle die Gruppe \"%s\""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "Gildenname"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Gruppe erhalten, es wurde schon einmal angefragt."
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, 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:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr ""
 "Anfrage für eine Gruppe erhalten, aber du bist bereits in einer Gruppe."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "Du wurdest zu einer Gruppe eingeladen."
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du wurdest zu der Gruppe %s eingeladen."
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Gruppe eingeladen."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Gruppe %s teilzunehmen."
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "Nehme Gruppeneinladung an"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 msgid "Cannot create party. You are already in a party"
 msgstr "Konnte keine Gruppe erstellen. Du bist schon in einer Gruppe."
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr "Gruppenname"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "Name deiner Gruppe wählen."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "Special"
 
@@ -4286,79 +4278,79 @@ msgstr ""
 "Dieser Kommando stoppt das Ignorieren eines Spielers, sofern er ignoriert "
 "wird."
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr "BP"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "Bot Überprüfer"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "Wer ist Online"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr "BGS"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "Similies"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr "FÄH"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr "SOZ"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr "TK"
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr "ZS"
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr "WW"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "WS"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "Wusstest du schon"
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "EINST"
 
@@ -4374,7 +4366,7 @@ msgstr "Login ändern"
 msgid "Choose World"
 msgstr "Wähle Welt"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr "Taste_%d"
@@ -4396,7 +4388,7 @@ msgid "JB%d"
 msgstr "JB%d"
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr "U-Taste"
 
@@ -4408,342 +4400,342 @@ msgstr "Lager"
 msgid "Cart"
 msgstr "Einkaufswagen"
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr "Du wurdest von einem %s getötet"
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "Du versuchst, einen nicht existierenden Gegenstand aufzuheben."
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Gegenstand ist zu schwer."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "Gegenstand ist zu weit weg."
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "Inventar ist voll."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr "Stapel ist zu groß."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "Gegenstand gehört jemand anderem."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr "Fehler bei dem Aufheben des Items."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Du hast %d [@@%d|%s@@] aufgehoben."
 msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr "Erfahrungspunkte"
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr "Job"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) normale Bewegungen"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr "(I) Bewegungen umkehren"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegt sich etwas verrückt"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegt sich verrückt"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) normal + verrückt Bewegen"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr "(?) unbekannte Bewegung"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) verrückte Bewegungen Nummer %d"
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr "(a) benutzerdefinierte verrückte Bewegung"
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr "(?) verrückte Bewegung"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr "(0) bewegt sich normal zum Ziel"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr "(0) bewegt sich zum Ziel in Distanz 1"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegt sich zum Ziel in Distanz 2"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegt sich zum Ziel in Distanz 3"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegt sich zum Ziel in Distanz 5"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegt sich zum Ziel in Distanz 7"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr "(A) bewegt sich zum Ziel in Reichweite"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr "(a) Bogenschützen Angriffsreichweite"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?) bewegt sich zu jedem Ziel"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr "(D) normales Folgen"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr "(R) relatives Folgen"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeltes Folgen"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr "(P) hinterher Folgen"
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr "(?) unbekannter Folge-Modus"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) Angriff"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) Normaler Angriff"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) wechsel das Angriffslayout ohne Schild"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S) wechsel das Angriffslayout mit Schild"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) gehe und greife an"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) gehe, greife an, hebe auf"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) ohne automatischen Angriff"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) kleine aufhebe Zelle 1x1"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) normale aufhebe Zelle 2x1"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 2x3 Kästchen nach vorne aufheben"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3 Kästchen aufheben"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) bis Distanz 4 gehen und aufheben"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) bis Distanz 8 gehen und aufheben"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr "(A) bis zur maximalen Distanz aufheben"
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?) aufheben"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) Normale Kartenansicht"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr "(D) Debug Kartenansicht"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr "(u) Ultra Kartenansicht"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr "(U) Ultra Kartenansicht 2"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) Leere Kartenansicht"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b) Schwarz-Weiß Kartenansicht"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) benutze #flar als magischen Angriff"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) benutze #chiza als magischen Angriff"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) benutze #ingrav als magischen Angriff"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) benutze #frillyar als magischen Angriff"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) benutze #upmarmu als magischen Angriff"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) magischer Angriff"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr "(a) greife alle Spieler an"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr "(f) greife alle Spieler, außer Freunde, an"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr "(b) greife schlechte Beziehungen an"
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr "(d) greife keine Spieler an"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr "(?) PVP Angriff"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr "(D) normale Imitation"
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr "(O) Ausrüstungsimitation"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) Anwesend"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) Abwesend"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) Abwesend"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr "(G) spielerverfolgende Kamera"
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr "(F) freie Kamera"
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr "Spielmodifikatoren sind aktiviert"
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr "Spielmodifikatoren sind deaktiviert"
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr "Spielmodifikatoren unbekannt"
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "Folgen:"
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "Folgen abgebrochen"
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "Imitation abgebrochen"
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr "Du siehst "
 
@@ -6034,15 +6026,15 @@ msgstr "Angriffsreichweite"
 msgid "Damage per sec."
 msgstr "Schaden pro Sek."
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Empty address given to Network::connect()!"
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr "Nicht möglich den host \" aufzulösen"
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr "Verbindung mit Server abgebrochen."
 
diff --git a/po/el.po b/po/el.po
index 9b12ee7ae..71bb64e13 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/manaplus/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr "Αποδεχόμενος τα εισερχόμενα αιτήματα του εμπορίου"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr "αστοχία"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Ρύθμισεις"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Σύνδεση σε τονδιακομιστή"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Σύνδεση"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Μπαίνοντας στον κόσμο του παιχνιδιού "
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Αναζητώντας χαρακτήρες"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Σύνδεση με τον διακομιστή του παιχνιδιού"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Αναζητούνται τα στοιχεία της εγγραφής"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Ο κωδικός σας άλλαξε με επιτυχία!"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Αλλαγή ηλεκτρονικού ταχυδρομείου"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "Ηλεκτρονικό ταχυδρομείο άλλαξε με επιτυχία!"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Διαγραφή Επιτυχής"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Αντίο, να επιστρέψεις κάθε στιγμή ..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr " %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί!Έξοδος."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Άκυρα ενημέρωση υποδοχής: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Σφάλμα κατά τη δημιουργία του καταλόγου ενημερώσεων!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Σφάλμα: %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί! Εγκατάλειψη."
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Γενικά"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Αποσφαλμάτωση"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Φωτογραφία αποθηκεύτηκε ως"
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Σώσιμο φωτογραφίας απέτυχε"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "Η σύνδεση με το διακομιστή χάθηκε."
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Σφάλμα δικτύου"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "Δε μπορεί να φορτώθει ο χάρτης"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Σφάλμα κατά τη φόρτωση %s"
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr "Όνομα"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Επίθεση"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Συζήτηση"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Κίνηση"
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr "Επαναφορά"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Αγορά"
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Κατάστημα"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Πουλήστε"
 
@@ -475,18 +474,18 @@ msgstr "Πουλήστε"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "Δημιουργία"
 
@@ -607,7 +606,7 @@ msgstr "Γυναίκα"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr "Συζήτηση"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Ψιθυρίζοντας στο %s: %s"
@@ -776,13 +775,9 @@ msgstr "Ναι"
 msgid "No"
 msgstr "Δεν"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Παράβλεψη"
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Κλείσιμο"
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Εξοπλισμός"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr "Φίλτρο:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Equip"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Χρήση"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Πέτα ..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Διαίρεση"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Ρούχα"
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr "Βάρος:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Κατάστημα"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Ανάκτηση"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Πέτα"
 
@@ -1134,7 +1129,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr "Υποβολή"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Σαφή"
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Κλειδί: %s"
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Προσθήκη στη συζήτηση"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Ξόρκια"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Μετονομασία υπογράψει χάρτη "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Όνομα:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Κατάστημα 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Αποθήκευσε τα μισά"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Αποθηκεύστε όλα τα"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Ανέκτησε τα μισά"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Ανέκτησε όλα"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 9baec4e74..abf8281db 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Ignoring incoming trade requests"
 msgid "Accepting incoming trade requests"
 msgstr "Accepting incoming trade requests"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -44,56 +44,56 @@ msgid "miss"
 msgstr "miss"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Setup"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Connecting to server"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Logging in"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Entering game world"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Requesting characters"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Connecting to the game server"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Changing game servers"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -103,50 +103,50 @@ msgstr "Changing game servers"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Requesting registration details"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Password Change"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -328,35 +328,35 @@ msgstr ""
 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:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Saving screenshot failed!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Network Error"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error while loading %s"
@@ -390,20 +390,20 @@ msgid "Name"
 msgstr "Name"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Attack"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Talk"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -416,8 +416,8 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Buy"
 
@@ -461,14 +461,13 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Shop"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Sell"
 
@@ -476,18 +475,18 @@ msgstr "Sell"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -593,7 +592,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "Create"
 
@@ -608,7 +607,7 @@ msgstr "Female"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -764,7 +763,7 @@ msgstr "Chat"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
@@ -777,13 +776,9 @@ msgstr "Yes"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -948,7 +943,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Close"
 
@@ -994,13 +989,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Equipment"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Unequip"
 
@@ -1028,7 +1023,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventory"
@@ -1042,31 +1037,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Equip"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Use"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Split"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1075,18 +1070,18 @@ msgid "Weight:"
 msgstr "Weight:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Store"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Drop"
 
@@ -1135,7 +1130,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1331,11 +1326,11 @@ msgid "Submit"
 msgstr "Submit"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1357,7 +1352,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1370,362 +1365,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Trade"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Players"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Switch server"
@@ -2348,11 +2311,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2775,158 +2738,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3450,7 +3425,7 @@ msgstr "Request for Trade"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Skills"
 
@@ -3529,175 +3504,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr "Create Guild"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr "Received party request, but one already exists."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s has invited you to join their party."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, 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:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4254,79 +4241,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4342,7 +4329,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4364,7 +4351,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4376,342 +4363,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5386,36 +5373,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5969,15 +5956,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/eo.po b/po/eo.po
index f8ec16175..a4c26fcd3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -475,18 +474,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr ""
 
@@ -607,7 +606,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -776,13 +775,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 02a9288ea..bba6023e2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,6 +5,7 @@
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
+#   <mtorres2022@gmail.com>, 2012.
 # Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011, 2012.
 # Nelson Martell <nelson6eeduardo65@gmail.com>, 2011.
 # Nelson  <nelson6eeduardo65@gmail.com>, 2011.
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-12 02:56+0000\n"
+"Last-Translator: Maria <mtorres2022@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/language/es/)\n"
 "Language: es\n"
@@ -31,7 +32,7 @@ msgstr "Ignorando las peticiones de intercambio"
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
@@ -48,56 +49,56 @@ msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Rendimiento"
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -107,50 +108,50 @@ msgstr "Cambiando servidores del juego"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
@@ -335,35 +336,35 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -397,20 +398,20 @@ msgid "Name"
 msgstr "Nombre"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Hablar"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Mover"
 
@@ -423,8 +424,8 @@ msgid "Reset"
 msgstr "Restablecer"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Comprar"
 
@@ -468,14 +469,13 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Tienda"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Vender"
 
@@ -483,18 +483,18 @@ msgstr "Vender"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -600,7 +600,7 @@ msgid "Race:"
 msgstr "Race:"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "Crear"
 
@@ -615,7 +615,7 @@ msgstr "Femenino"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Otro"
 
@@ -784,13 +784,9 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -864,7 +860,7 @@ msgstr "%d FPS"
 #: src/gui/debugwindow.cpp:179 src/gui/debugwindow.cpp:265
 #, c-format
 msgid "%d LPS"
-msgstr ""
+msgstr "%d LPS"
 
 #: src/gui/debugwindow.cpp:192 src/gui/debugwindow.cpp:244
 msgid "Textures count:"
@@ -955,7 +951,7 @@ msgstr "¿Sabías que...?"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1002,13 +998,13 @@ msgid "Please at least type both the address and the port of the server."
 msgstr ""
 "Por favor, por lo menos especifique el nombre y el puerto del servidor."
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Equipamiento"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -1036,7 +1032,7 @@ msgstr "por cantidad"
 msgid "by type"
 msgstr "por tipo"
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventario"
@@ -1050,31 +1046,31 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Conjuntos"
 
@@ -1083,18 +1079,18 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Tirar"
 
@@ -1143,7 +1139,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Estadísticas"
 
@@ -1181,13 +1177,13 @@ msgstr "Muertes: %s, exp. total: %s"
 #: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s"
-msgstr ""
+msgstr "Avg Exp: %s"
 
 #: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
 #: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
 #, c-format
 msgid "No. of avg mob to next level: %s"
-msgstr ""
+msgstr "No. of avg mob to next level: %s"
 
 #: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
 #: src/gui/killstats.cpp:242
@@ -1339,11 +1335,11 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -1365,7 +1361,7 @@ msgid "Outfit: %d"
 msgstr "Conjuntos: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -1378,362 +1374,330 @@ msgstr "Quitárselo antes"
 msgid "Away outfit"
 msgstr "Conjunto para modo AFK"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Intercambio"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "Sanar"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "Ser amigo"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr "Desatender"
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr "Lista negra"
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr "Fijar como enemigo"
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "Borrar"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr "Des-ignorar"
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "Ignorar completamente"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "Seguir"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "Imitación"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr "Invitar a grupo"
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "Sacar del grupo"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "Sacar del clan"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el clan"
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr "Invitar al clan"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "Sacar jugador"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr "Eliminar"
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "Mostrar artículos"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "Desvestir"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "Agregar comentario"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "Comprar (?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "Vender (?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "Sacar"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritaria"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Jugadores"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "Sacar del grupo"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Recoger"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr "Deformar"
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr "Mover cámara"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Hechizos"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "Cargar hechizos antiguos"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr "No remover nombre"
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "Remover nombre"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "Dejar"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr "Invitar a grupo"
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "Cambiar posición del Clan"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Nombre:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "Comentario del jugador            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "Comentario:                      "
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "Tirar todo"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Cargar atajos antiguos de artículos"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
-msgstr ""
+msgstr "Limpiar ventana de lanzamiento"
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(predeterminado)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "Subir"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "Bajar"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "Desvestir"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "Ser amigo"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr "Desatender"
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr "Lista negra"
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr "Fijar como enemigo"
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "Borrar"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr "Des-ignorar"
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "Ignorar completamente"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "Seguir"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "Imitación"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "Comprar (?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "Vender (?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "Mostrar artículos"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr "Remover de lista de recogido"
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr "Agregar a lista de recogido"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Cambiar de servidor"
@@ -1832,7 +1796,7 @@ msgstr "requiere v%s"
 
 #: src/gui/setupactiondata.h:48
 msgid "Target and attack keys"
-msgstr ""
+msgstr "Teclas de apuntar y atacar"
 
 #: src/gui/setupactiondata.h:58
 msgid "Target & Attack"
@@ -1868,7 +1832,7 @@ msgstr "Sin seleccionar"
 
 #: src/gui/setupactiondata.h:103
 msgid "Target monster"
-msgstr ""
+msgstr "Apuntar monster"
 
 #: src/gui/setupactiondata.h:108
 msgid "Target NPC"
@@ -1912,7 +1876,7 @@ msgstr "Seleccionar OK"
 
 #: src/gui/setupactiondata.h:172
 msgid "Shortcuts modifiers keys"
-msgstr ""
+msgstr "Teclas de atajo modificadoras"
 
 #: src/gui/setupactiondata.h:177
 msgid "Item Shortcuts Key"
@@ -1920,7 +1884,7 @@ msgstr "Tecla de acceso directo de objeto"
 
 #: src/gui/setupactiondata.h:182
 msgid "Shortcuts keys"
-msgstr ""
+msgstr "Teclas de atajo"
 
 #: src/gui/setupactiondata.h:187 src/gui/setupactiondata.h:192
 #: src/gui/setupactiondata.h:197 src/gui/setupactiondata.h:202
@@ -2030,15 +1994,15 @@ msgstr "Pestaña Social Siguiente"
 
 #: src/gui/setupactiondata.h:420
 msgid "Emote modifiers keys"
-msgstr ""
+msgstr "Teclas de emotes modificadoras"
 
 #: src/gui/setupactiondata.h:425
 msgid "Emote modifier key"
-msgstr ""
+msgstr "Tecla de emotes modificadoras"
 
 #: src/gui/setupactiondata.h:430
 msgid "Emote shortcuts"
-msgstr ""
+msgstr "Tecla de emote"
 
 #: src/gui/setupactiondata.h:435 src/gui/setupactiondata.h:440
 #: src/gui/setupactiondata.h:445 src/gui/setupactiondata.h:450
@@ -2070,7 +2034,7 @@ msgstr "Atajo para Emoticono %d"
 
 #: src/gui/setupactiondata.h:684
 msgid "Outfits keys"
-msgstr ""
+msgstr "Tecla de vestuarios"
 
 #: src/gui/setupactiondata.h:689
 msgid "Wear Outfit"
@@ -2086,7 +2050,7 @@ msgstr "Copiar lo que tiene equipado a Conjunto"
 
 #: src/gui/setupactiondata.h:704
 msgid "Outfits shortcuts"
-msgstr ""
+msgstr "Teclas de atajo de vestuarios"
 
 #: src/gui/setupactiondata.h:709 src/gui/setupactiondata.h:714
 #: src/gui/setupactiondata.h:719 src/gui/setupactiondata.h:724
@@ -2114,7 +2078,7 @@ msgstr ""
 #: src/gui/setupactiondata.h:939 src/gui/setupactiondata.h:944
 #, c-format
 msgid "Outfit Shortcut %d"
-msgstr ""
+msgstr "Tecla de atajo de vestuarios %d"
 
 #: src/gui/setupactiondata.h:958
 msgid "Toggle Chat"
@@ -2258,7 +2222,7 @@ msgstr "Tecla modificadora"
 
 #: src/gui/setupactiondata.h:1151
 msgid "Move Keys"
-msgstr ""
+msgstr "Teclas de movimiento"
 
 #: src/gui/setupactiondata.h:1156 src/gui/setupactiondata.h:1435
 msgid "Move Up"
@@ -2278,7 +2242,7 @@ msgstr "Derecha"
 
 #: src/gui/setupactiondata.h:1176
 msgid "Move to navigation point shortcuts"
-msgstr ""
+msgstr "Teclas de atajo para moverse al punto de navegacion"
 
 #: src/gui/setupactiondata.h:1181 src/gui/setupactiondata.h:1186
 #: src/gui/setupactiondata.h:1191 src/gui/setupactiondata.h:1196
@@ -2306,71 +2270,71 @@ msgstr ""
 #: src/gui/setupactiondata.h:1411 src/gui/setupactiondata.h:1416
 #, c-format
 msgid "Move to point Shortcut %d"
-msgstr ""
+msgstr "Moverse a punto de atajo %d"
 
 #: src/gui/setupactiondata.h:1430
 msgid "Move & selection"
-msgstr ""
+msgstr "Mover y seleccionar"
 
 #: src/gui/setupactiondata.h:1455
 msgid "Move Home"
-msgstr ""
+msgstr "Moverse a Home"
 
 #: src/gui/setupactiondata.h:1460
 msgid "Move End"
-msgstr ""
+msgstr "Moverse a End"
 
 #: src/gui/setupactiondata.h:1465
 msgid "Page up"
-msgstr ""
+msgstr "Page up"
 
 #: src/gui/setupactiondata.h:1470
 msgid "Page down"
-msgstr ""
+msgstr "Page down"
 
 #: src/gui/setupactiondata.h:1480
 msgid "Select"
-msgstr ""
+msgstr "Select"
 
 #: src/gui/setupactiondata.h:1485
 msgid "Select2"
-msgstr ""
+msgstr "Select2"
 
 #: src/gui/setupactiondata.h:1500
 msgid "Backspace"
-msgstr ""
+msgstr "Backspace"
 
 #: src/gui/setupactiondata.h:1505
 msgid "Insert"
-msgstr ""
+msgstr "Insert"
 
 #: src/gui/setupactiondata.h:1510
 msgid "Tab"
-msgstr ""
+msgstr "Tab"
 
 #: src/gui/setupactiondata.h:1515
 msgid "Mod"
-msgstr ""
+msgstr "Mod"
 
 #: src/gui/setupactiondata.h:1541
 msgid "Basic"
-msgstr ""
+msgstr "Basico"
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr "Ventanas"
 
 #: src/gui/setupactiondata.h:1545
 msgid "Emotes"
-msgstr ""
+msgstr "Emotes"
 
 #: src/gui/setupactiondata.h:1549
 msgid "Gui"
-msgstr ""
+msgstr "Interfaz"
 
 #: src/gui/setup_audio.cpp:44
 msgid "(no sound)"
@@ -2410,27 +2374,27 @@ msgstr "Volumen de Música"
 
 #: src/gui/setup_audio.cpp:82
 msgid "Audio frequency"
-msgstr ""
+msgstr "Frequencia de Audio"
 
 #: src/gui/setup_audio.cpp:86
 msgid "mono"
-msgstr ""
+msgstr "mono"
 
 #: src/gui/setup_audio.cpp:87
 msgid "stereo"
-msgstr ""
+msgstr "Estereo"
 
 #: src/gui/setup_audio.cpp:88
 msgid "surround"
-msgstr ""
+msgstr "surround"
 
 #: src/gui/setup_audio.cpp:89
 msgid "surround+center+lfe"
-msgstr ""
+msgstr "surround+center+lfe"
 
 #: src/gui/setup_audio.cpp:90
 msgid "Audio channels"
-msgstr ""
+msgstr "Canales de Audio"
 
 #: src/gui/setup_audio.cpp:94
 msgid "Sound effects"
@@ -2643,7 +2607,7 @@ msgstr "Restaurar Ventanas"
 
 #: src/gui/setup_input.cpp:102
 msgid "Input"
-msgstr ""
+msgstr "Entrada"
 
 #: src/gui/setup_input.cpp:124
 msgid "Assign"
@@ -2655,7 +2619,7 @@ msgstr "Retirar"
 
 #: src/gui/setup_input.cpp:132
 msgid "Reset all keys"
-msgstr ""
+msgstr "Restablecer todas las teclas"
 
 #: src/gui/setup_input.cpp:135
 msgid "Default"
@@ -2676,7 +2640,7 @@ msgstr ""
 
 #: src/gui/setup_input.cpp:351
 msgid "unknown"
-msgstr ""
+msgstr "Desconocido"
 
 #: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
@@ -2787,158 +2751,170 @@ msgid "Attack while moving"
 msgstr "Atacar mientras está en movimiento"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr "Atacar proximo target"
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "Sincronización de movimiento de jugador"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "Programa de movimientos locos A"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "Jugador"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "Mostrar barra de energía propia"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "Habilitar estadísticas rápidas"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "Apuntar a los jugadores en derredor, no necesariamente al más cercano"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "Mostrar los mensajes de experiencia de trabajo"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "Mostrar las ventanas emergentes de jugadores"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr "Mensaje afk"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "Mostrar trabajo"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
+msgstr "Habilitar filtro de recogido"
+
+#: src/gui/setup_other.cpp:143
 msgid "Enable advert protocol"
 msgstr "Habilitar el protocolo de anuncio"
 
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Aceptar solicitudes de compra/venta"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "Habilitar la tienda"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "Registro de diálogo de NPC"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr "Soporte de bots"
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr "Habilitar soporte para auction bot"
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Habilitar soporte de bot clan y deshabilitar soporte de clan nativo"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
-msgstr ""
+msgstr "Teclado"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
-msgstr ""
+msgstr "Retraso en repeticion"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
-msgstr ""
+msgstr "Intervalo de Repeticion"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
-msgstr ""
+msgstr "Siempre mostrar"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
-msgstr ""
+msgstr "Auto  hide en peque"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
-msgstr ""
+msgstr "Siempre auto hide"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
-msgstr ""
+msgstr "Atajos"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
-msgstr ""
+msgstr "Proxy Server"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
-msgstr ""
+msgstr "Proxy del Sistema"
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
-msgstr ""
+msgstr "Conexion directa"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
-msgstr ""
+msgstr "SOCKS5 hostname"
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
-msgstr ""
+msgstr "Tipo de proxy"
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
-msgstr ""
+msgstr "Direccion: puerto"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr "Habilitar el ataque del lado del servidor"
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Habilitar el control de bot"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activar la protección de servidores con errores (no deshabilitar)"
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite protector"
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Usar FBO para capturas de pantalla (sólo para opengl)"
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr "Retraso de red entre sub servidores"
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Mostrar fondo"
 
@@ -2993,14 +2969,15 @@ msgstr "Deshabilitar caché de criaturas (Software)"
 #: src/gui/setup_perfomance.cpp:93
 msgid "Different options (enable or disable can improve perfomance)"
 msgstr ""
+"Diferentes opciones (habitar o deshabilitar puede ayudar en el rendimiento)"
 
 #: src/gui/setup_perfomance.cpp:96
 msgid "Enable texture compression (fast OpenGL)"
-msgstr ""
+msgstr "Habilitar compresion de texturas (OpenGL rapido)"
 
 #: src/gui/setup_perfomance.cpp:99
 msgid "Enable rectangular texture extension (OpenGL)"
-msgstr ""
+msgstr "Habilitar extensiones de textura rectangulares (OpenGL)"
 
 #: src/gui/setup_players.cpp:53
 msgid "Show gender"
@@ -3341,7 +3318,7 @@ msgstr "Sostener entrada del teclado y del ratón."
 
 #: src/gui/setup_visual.cpp:56
 msgid "Blurring textures (OpenGL)"
-msgstr ""
+msgstr "Texturas Borrosas (OpenGL)"
 
 #: src/gui/setup_visual.cpp:59
 msgid "Gui opacity"
@@ -3401,19 +3378,19 @@ msgstr "Detalle de partículas"
 
 #: src/gui/setup_visual.cpp:90
 msgid "best quality"
-msgstr ""
+msgstr "Mejor Calidad"
 
 #: src/gui/setup_visual.cpp:91
 msgid "normal"
-msgstr ""
+msgstr "Normal"
 
 #: src/gui/setup_visual.cpp:92
 msgid "best perfomance"
-msgstr ""
+msgstr "Mejor rendimiento"
 
 #: src/gui/setup_visual.cpp:93
 msgid "Particle physics"
-msgstr ""
+msgstr "Particle physics"
 
 #: src/gui/setup_visual.cpp:98
 msgid "Gamma"
@@ -3429,7 +3406,7 @@ msgstr "Vsync"
 
 #: src/gui/setup_visual.cpp:109
 msgid "Center game window"
-msgstr ""
+msgstr "Centralizar ventana"
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -3465,7 +3442,7 @@ msgstr "Propuesta de intercambio"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -3544,175 +3521,190 @@ msgstr "¿Dejar el clan?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "¿Estás seguro de dejar el clan %s?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Jugador %s invitado al grupo."
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Grupo %s requisitado."
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr "Invitación de un miembro al grupo"
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "¿A quién te gustaría invitar al grupo %s?"
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "¿Dejar grupo?"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "¿Estás seguro de que quieres dejar el grupo %s?"
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr "Navegación"
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr "Ataque"
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr "Criaturas prioritarias"
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "Criaturas atacadas"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr "Criaturas ignoradas"
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr "Pik"
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr "Recoger Items"
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr "Ignorar Items"
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "Crear Clan"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "Crear grupo"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de %s."
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de %s."
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación al clan de  %s."
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitación al clan de %s."
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando clan llamado %s."
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "Nombre del clan"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "Escoge el nombre de tu clan."
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del clan, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado al clan %s."
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al clan"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "Fuiste invitado a un grupo."
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, 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:1614
+#: src/gui/socialwindow.cpp:1557
 #, 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:1619
+#: src/gui/socialwindow.cpp:1562
 #, 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:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 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:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "Escoge el nombre del grupo."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "Especiales"
 
@@ -4273,79 +4265,79 @@ msgstr "Comando: /unignore <jugador>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando para de ignorar al jugador si está siendo ignorado."
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "Control de robot"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "Quién está conectado"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr "KS"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "Emotíconos"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr "SKI"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr "SH"
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr "SP"
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr "DR"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "¿Sabías que..."
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "SET"
 
@@ -4361,7 +4353,7 @@ msgstr "Cambiar de Login"
 msgid "Choose World"
 msgstr "Escojer Mundo"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
@@ -4370,7 +4362,7 @@ msgstr "tecla_%d"
 #: src/inputmanager.cpp:312
 #, c-format
 msgid "JButton%d"
-msgstr ""
+msgstr "JButton%d"
 
 #: src/inputmanager.cpp:324
 msgid "unknown key"
@@ -4380,10 +4372,10 @@ msgstr "tecla desconocida"
 #: src/inputmanager.cpp:351
 #, c-format
 msgid "JB%d"
-msgstr ""
+msgstr "JB%d"
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr "tecla u"
 
@@ -4395,342 +4387,342 @@ msgstr "Almacenamiento"
 msgid "Cart"
 msgstr "Mochila"
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr "Fuiste eliminado por %s"
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistente."
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Recogiste un %d [@@%d|%s@@]."
 msgstr[1] "Recogiste unos %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr "xp"
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr "trabajo"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) moverse predeterminado"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr "(I) moverse invertido"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos locos"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos locos"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr "(?) movimiento desconocido"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimiento loco número %d"
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr "(a) maniobra alocada personalizada"
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr "(?) maniobra loca"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse al objetivo en distancia 1"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr "(A) desplazarse al objetivo en el rango de ataque"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr "(a) rango de ataque de arquero"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?) mover al objetivo"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr "(P) seguimiento como mascota"
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr "(?) seguimiento desconocido"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) atacar"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) ataque predeterminado"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S)  intercambiar ataque con escudo"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger interesadamente a 2x3 celda"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger a 3x3 celdas"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr "(D) vista depurar del mapa"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr "(u) ultra vista del mapa"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra vista del mapa 2"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) vista vacía del mapa"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr "(a) atacar a todos los jugadores"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr "(f) atacar a todos, excepto a amigos"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr "(b) atacar a quienes están en malas relaciones"
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr "(d) no atacar a los jugadores"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr "(?) ataque pvp"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de conjuntos"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) afuera"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr "Los modificadores del juego son desconocidos"
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr "Imitación: "
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr "Ves "
 
@@ -6018,15 +6010,15 @@ msgstr "Alcance de Ataque"
 msgid "Damage per sec."
 msgstr "Daño por segundo."
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "¡Dirección vacía enviada a Network::connect()!"
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr "No es posible determinar el host \""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr "Conexión al servidor terminada. "
 
diff --git a/po/et.po b/po/et.po
index 25a0a24ac..6fa7fdfd7 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "Viga"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -475,18 +474,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr ""
 
@@ -607,7 +606,7 @@ msgstr "Naine"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr "Vestlus"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -776,13 +775,9 @@ msgstr "Jah"
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulge"
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index b6d2e5ef4..47a7f34c5 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "خطا"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -322,35 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "کلی"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "خطای شبکه"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,20 +384,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -410,8 +410,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -455,14 +455,13 @@ msgid "Max"
 msgstr "حداکثر"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -470,18 +469,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -587,7 +586,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "بساز"
 
@@ -602,7 +601,7 @@ msgstr "زن"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -758,7 +757,7 @@ msgstr "چت"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -771,13 +770,9 @@ msgstr "بلی"
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -942,7 +937,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -988,13 +983,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "تجهیزات"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1022,7 +1017,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1036,31 +1031,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1069,18 +1064,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1129,7 +1124,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1323,11 +1318,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1349,7 +1344,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1362,362 +1357,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2340,11 +2303,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2767,158 +2730,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3442,7 +3417,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3521,175 +3496,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4246,79 +4233,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4334,7 +4321,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4356,7 +4343,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4368,341 +4355,341 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5377,36 +5364,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5960,15 +5947,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 99964e5ef..d8cb2bf48 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
@@ -27,7 +27,7 @@ msgstr "Et huomioi kaupankäyntipyyntöjä"
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
@@ -44,56 +44,56 @@ msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "-"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Tehokkuus"
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Kuva"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr "Teemat"
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -103,50 +103,50 @@ msgstr "Vaihdan pelipalvelinta"
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -332,35 +332,35 @@ msgstr ""
 "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
 "\"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -394,20 +394,20 @@ msgid "Name"
 msgstr "Nimi"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Hyökkää"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Keskustele"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Liiku"
 
@@ -420,8 +420,8 @@ msgid "Reset"
 msgstr "Nollaa"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Osta"
 
@@ -465,14 +465,13 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Kauppa"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Myy"
 
@@ -480,18 +479,18 @@ msgstr "Myy"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -597,7 +596,7 @@ msgid "Race:"
 msgstr "Rotu: "
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "Luo"
 
@@ -612,7 +611,7 @@ msgstr "Naispuolinen"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Muu"
 
@@ -781,13 +780,9 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Ohita"
 
@@ -952,7 +947,7 @@ msgstr "Tiesitkö?"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulje"
 
@@ -998,13 +993,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Varusteet"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
@@ -1032,7 +1027,7 @@ msgstr "määrä"
 msgid "by type"
 msgstr "tyyppi"
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Tavarat"
@@ -1046,31 +1041,31 @@ msgid "Filter:"
 msgstr "Suodin:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Ota käyttöön"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Käytä"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Pudota..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Jaa"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
 
@@ -1079,18 +1074,18 @@ msgid "Weight:"
 msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Varastoi"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Pudota"
 
@@ -1139,7 +1134,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Paino: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Tappotilastot"
 
@@ -1335,11 +1330,11 @@ msgid "Submit"
 msgstr "Lähetä"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -1361,7 +1356,7 @@ msgid "Outfit: %d"
 msgstr "Asu: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Näppäin: %s"
@@ -1374,362 +1369,330 @@ msgstr "Riisu ensin"
 msgid "Away outfit"
 msgstr "Poissaoloasu"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Tee kaupat"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "Kuiskaa"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "Paranna"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "Ystävysty"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr "Vaimenna"
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr "Musta lista"
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr "Aseta viholliseksi"
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "Pyyhi"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr "Huomioi jälleen"
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "Jätä täysin huomiotta"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "Seuraa"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "Matki"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr "Kutsu ryhmään"
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "Potki ryhmästä"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "Potki pelaaja"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr "Pommita"
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "Näytä tavarat"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "Riisu"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "Osta (?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "Myy (?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "Potki"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr "Poista hyökkäyslistasta"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr "Lisää prioriteettihyökkäyslistalle"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Pelaajat"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "Potki ryhmästä"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Poimi"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Karttaolio"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "Poista"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr "Warppaa"
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr "Poista asu"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Loitsut"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "Lataa vanhat loitsut"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr "Älä poista nimeä"
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "Poista nimi"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "Eroa"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr "Kutsu ryhmään"
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "Pelaajakommentti          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "Kommentti:                    "
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Varastoi 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Varastoi puolet"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Lataa vanhat tavarapikavalinnat"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Piilota"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Näytä"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(oletus)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "Siirrä ylös"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "Siirrä alas"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "Riisu"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "Ystävysty"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr "Vaimenna"
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr "Musta lista"
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr "Aseta viholliseksi"
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "Pyyhi"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr "Huomioi jälleen"
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "Jätä täysin huomiotta"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "Seuraa"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "Matki"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "Osta (?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "Myy (?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "Näytä tavarat"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Vaihda palvelinta"
@@ -2352,11 +2315,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2781,158 +2744,170 @@ msgid "Attack while moving"
 msgstr "Hyökkää liikkuessa"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "Synkronoi pelaajan liikkeet"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "Villiliike (a) -ohjelma"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "Pelaaja"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "Näytä oma vp-palkki"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "Ota pikatilastot käyttöön"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "Vaihda pelaajakohteita syklissä"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "Näytä työkokemusviestit"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "Näytä pelaajaponnahdusikkunat"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr "Poissaoloviesti"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "Näytä työ"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr "Ota käyttöön hyökkäyssuodin"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:143
 msgid "Enable advert protocol"
 msgstr "Ota käyttöön mainosprotokolla"
 
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Salli osta/myy-pyynnöt"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "Ota kauppatila käyttöön"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr "Bottien tuki"
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr "Ota käyttöön huutokauppabotin tuki"
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ota käyttöön kiltabottien tuki ja poista sisäinen kiltatuki käytöstä"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Ota bottitutka käyttöön"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Ota käyttöön bugisten palvelinten suojaus (älä poista käytöstä)"
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "Matalan liikenteen tila"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr "Piilota kilpihahmo"
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Näytä tausta"
 
@@ -3458,7 +3433,7 @@ msgstr "Kaupantekoehdotus"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s haluaa %s %s - hyväksytkö?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Taidot"
 
@@ -3537,175 +3512,190 @@ msgstr "Eroa killasta?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti erota killasta %s?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Ryhmä"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Käyttäjä %s kutsuttu ryhmään."
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Ryhmästä %s eroamista pyydetty."
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr "Jäsenen kutsuminen ryhmään"
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kenet haluaisit kutsua ryhmään %s?"
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "Eroa ryhmästä?"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Haluatko varmasti erota ryhmästä %s?"
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr "Hyö"
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr "Priorisoidut kohteet"
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "Hyökkäyskohteet"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr "Ohitettavat kohteet"
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "Luo kilta"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "Luo ryhmä"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Suhteet"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "Kutsu"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Luon killan %s."
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "Luon ryhmän %s."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "Killan nimi"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "Valitse killallesi nimi."
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s on kutsunut sinut liittymään kiltaan %s."
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "Sinut on kutsuttu liittymään ryhmään."
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sinut on kutsuttu liittymään ryhmään %s."
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 msgid "Cannot create party. You are already in a party"
 msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "Erikoisuudet"
 
@@ -4265,79 +4255,79 @@ msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Tämä komento huomioi pelaajan taas, jos tämä on ensin jätetty huomiotta."
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr "BT"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "Bottitutka"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr "LIN"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "Kuka on linjoilla"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr "TT"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "Hymiöt"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr "Tie"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Hahmon tiedot"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr "Var"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr "Tav"
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr "Tai"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr "Eri"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr "Sos"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr "PV"
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr "Lo"
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr "Pu"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "T?"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "Tiesitkö"
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "Ase"
 
@@ -4353,7 +4343,7 @@ msgstr "Vaihda kirjautumistietoja"
 msgid "Choose World"
 msgstr "Valitse pelimaailma"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4375,7 +4365,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4387,342 +4377,342 @@ msgstr "Varasto"
 msgid "Cart"
 msgstr "Kärry"
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr "Sinut tappoi %s."
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit poimia olemattoman tavaran."
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran poimimisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr "(?) tuntematon liikkumistapa"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) villiliike nro %d"
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr "(a) jousiampujan hyökkäyskantama"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) mene, hyökkää, poimi"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pieni poiminta 1x1 ruutua"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) oletuspoiminta 2x1 ruutua"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) poiminta edestä 2x3 ruutua"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) poiminta 3x3 ruutua"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) mene ja poimi etäisyydellä 4"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) mene ja poimi etäisyydellä 8"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr "(A) mene ja poimi maksimietäisyydellä"
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?) poiminta"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) tyhjä karttanäkymä"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr "(a) hyökkää kaikkien pelaajien kimppuun"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr "(b) hyökkää jos huonot suhteet"
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr "(?) pelaajien kanssa taistelu"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) poissa"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr "Pelimuokkaimet ovat tuntemattomia"
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr "Näet "
 
@@ -5999,15 +5989,15 @@ msgstr "Hyökkäyskantama"
 msgid "Damage per sec."
 msgstr "Vahinko sekunnissa."
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Tyhjä osoite Network::connect()-pyynnössä!"
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr "Osoitetta ei löydy: \""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr "Yhteys palvelimeen katkaistu. "
 
diff --git a/po/fr.po b/po/fr.po
index 9b103ab96..0356a31d5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:59+0000\n"
+"Last-Translator: reid <reidyaro@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -33,7 +33,7 @@ msgstr "Ignorer les requêtes d'échanges entrantes"
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
@@ -50,56 +50,56 @@ msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr "Thèmes"
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -109,50 +109,50 @@ msgstr "Changement de serveur de jeu"
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -339,36 +339,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Déboguage"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 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:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -402,20 +402,20 @@ msgid "Name"
 msgstr "Nom"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Attaquer"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Parler"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Déplacement"
 
@@ -428,8 +428,8 @@ msgid "Reset"
 msgstr "Réinitialiser"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Acheter"
 
@@ -473,14 +473,13 @@ msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Boutique"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Vendre"
 
@@ -488,18 +487,18 @@ msgstr "Vendre"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -605,7 +604,7 @@ msgid "Race:"
 msgstr "Race:"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "Créer"
 
@@ -620,7 +619,7 @@ msgstr "Féminin"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Autre"
 
@@ -789,13 +788,9 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -869,7 +864,7 @@ msgstr "%d FPS"
 #: src/gui/debugwindow.cpp:179 src/gui/debugwindow.cpp:265
 #, c-format
 msgid "%d LPS"
-msgstr ""
+msgstr "%d LPS"
 
 #: src/gui/debugwindow.cpp:192 src/gui/debugwindow.cpp:244
 msgid "Textures count:"
@@ -878,7 +873,7 @@ msgstr "Comptage des trames :"
 #: src/gui/debugwindow.cpp:235
 #, c-format
 msgid "Particle count: %d"
-msgstr "Effets de particules : %d"
+msgstr "Nombre de particules : %d"
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:306
 #: src/gui/debugwindow.cpp:353
@@ -929,15 +924,15 @@ msgstr "Coup Critique :"
 #: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:320
 #: src/gui/debugwindow.cpp:355
 msgid "Target Level:"
-msgstr "Cibler un niveau :"
+msgstr "Niveau de la cible:"
 
 #: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:356
 msgid "Target Party:"
-msgstr "Cibler un groupe :"
+msgstr "Groupe de la cible: :"
 
 #: src/gui/debugwindow.cpp:329 src/gui/debugwindow.cpp:357
 msgid "Target Guild:"
-msgstr "Cibler une guilde :"
+msgstr "Guilde de la cible::"
 
 #: src/gui/debugwindow.cpp:395 src/gui/debugwindow.cpp:400
 #, c-format
@@ -960,7 +955,7 @@ msgstr "Le saviez-vous ?"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fermer"
 
@@ -1006,13 +1001,13 @@ msgstr "Description :"
 msgid "Please at least type both the address and the port of the server."
 msgstr "S'il vous plait, entrez l'adresse et le port du serveur."
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Équipement"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -1040,7 +1035,7 @@ msgstr "par nombre"
 msgid "by type"
 msgstr "par type"
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventaire"
@@ -1054,51 +1049,51 @@ msgid "Filter:"
 msgstr "Filtre :"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Équiper"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Utiliser"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Jeter..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Partager"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
-msgstr "Tenues"
+msgstr "Costumes"
 
 #: src/gui/inventorywindow.cpp:179
 msgid "Weight:"
 msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Jeter"
 
@@ -1147,7 +1142,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Poids : %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Statistiques"
 
@@ -1185,13 +1180,13 @@ msgstr "Nbre Tués : %s, total exp : %s"
 #: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s"
-msgstr ""
+msgstr "Exp. moy.: %s"
 
 #: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
 #: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
 #, c-format
 msgid "No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Nb. de mobs moy. pour proc. niv.: %s"
 
 #: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
 #: src/gui/killstats.cpp:242
@@ -1343,11 +1338,11 @@ msgid "Submit"
 msgstr "Soumettre"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Effacer"
 
@@ -1369,7 +1364,7 @@ msgid "Outfit: %d"
 msgstr "Tenue : %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Touche : %s"
@@ -1382,362 +1377,330 @@ msgstr "Retirer d'abord l'équipement"
 msgid "Away outfit"
 msgstr "Équipement en absence"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Échange"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "Message"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "Soigner"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "Être ami"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr "Éviter"
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr "Liste noire"
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr "Définir comme ennemi"
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "Éliminer"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr "Ne plus ignorer"
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "Ignorer complètement"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "Suivre"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "Imiter"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr "Inviter dans le groupe"
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "Sortir du groupe"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "Sortir de la guilde"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "Sortir le joueur"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr "Annihiler"
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "Montrer les objets"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "Déshabiller"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "Acheter (?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "Vendre (?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "Virer"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr "Enlever de la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr "Ajouter à la liste de priorités d'attaque"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la boite de dialogue"
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Joueurs"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "Sortir du groupe"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Ramasser"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Objet de carte"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr "Téléportation"
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr "Bouger la caméra"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr "Effacer la tenue"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Sortilèges"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "Charger les anciens sorts"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "Éditer le sortilège"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr "Ne pas enlever les noms"
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "Enlève le nom"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "Quitter"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr "Inviter dans le groupe"
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
-msgstr "Changer la position de la Guilde"
+msgstr "Changer de position dans la guilde"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Nom : "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "Le joueur commente            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "Commentaire :                      "
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Entreposer 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Entreposer tout"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "Jeter tout"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Charger les anciens raccourcis d'objets"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr "Vider la fenêtre de dépot"
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Cacher"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Montrer"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(défaut)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "Aller vers le haut"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "Aller vers le bas"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "Déshabiller"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "Être ami"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr "Éviter"
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr "Liste noire"
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr "Définir comme ennemi"
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "Éliminer"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr "Ne plus ignorer"
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "Ignorer complètement"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "Suivre"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "Imiter"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "Acheter (?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "Vendre (?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "Montrer les objets"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr "Retirer de la liste de ramassage"
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr "Ajouter à la liste de ramassage"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Changer de serveur"
@@ -1823,7 +1786,7 @@ msgstr "Préparation du téléchargement"
 
 #: src/gui/serverdialog.cpp:497
 msgid "Error retreiving server list!"
-msgstr "Erreur lors du téléchargement de la liste de serveur !"
+msgstr "Erreur lors du téléchargement de la liste de serveurs !"
 
 #: src/gui/serverdialog.cpp:585
 msgid "requires a newer version"
@@ -1836,7 +1799,7 @@ msgstr "requiert la v%s"
 
 #: src/gui/setupactiondata.h:48
 msgid "Target and attack keys"
-msgstr ""
+msgstr "touches de visée et d'attaque"
 
 #: src/gui/setupactiondata.h:58
 msgid "Target & Attack"
@@ -1916,7 +1879,7 @@ msgstr "Sélectionner OK"
 
 #: src/gui/setupactiondata.h:172
 msgid "Shortcuts modifiers keys"
-msgstr ""
+msgstr "touches des modificateurs de raccourcis"
 
 #: src/gui/setupactiondata.h:177
 msgid "Item Shortcuts Key"
@@ -1924,7 +1887,7 @@ msgstr "Touche de raccourcis objets"
 
 #: src/gui/setupactiondata.h:182
 msgid "Shortcuts keys"
-msgstr ""
+msgstr "Touches de raccourci"
 
 #: src/gui/setupactiondata.h:187 src/gui/setupactiondata.h:192
 #: src/gui/setupactiondata.h:197 src/gui/setupactiondata.h:202
@@ -2034,15 +1997,15 @@ msgstr "Onglet de dialogue suivant"
 
 #: src/gui/setupactiondata.h:420
 msgid "Emote modifiers keys"
-msgstr ""
+msgstr "touches des modificateurs d'emote"
 
 #: src/gui/setupactiondata.h:425
 msgid "Emote modifier key"
-msgstr ""
+msgstr "touche de modificateur d'emote"
 
 #: src/gui/setupactiondata.h:430
 msgid "Emote shortcuts"
-msgstr ""
+msgstr "Raccourcis d'emote"
 
 #: src/gui/setupactiondata.h:435 src/gui/setupactiondata.h:440
 #: src/gui/setupactiondata.h:445 src/gui/setupactiondata.h:450
@@ -2074,7 +2037,7 @@ msgstr "Raccourci d'émoticône %d"
 
 #: src/gui/setupactiondata.h:684
 msgid "Outfits keys"
-msgstr ""
+msgstr "Touches des tenues"
 
 #: src/gui/setupactiondata.h:689
 msgid "Wear Outfit"
@@ -2090,7 +2053,7 @@ msgstr "Copier l'équipement porté dans les tenues"
 
 #: src/gui/setupactiondata.h:704
 msgid "Outfits shortcuts"
-msgstr ""
+msgstr "Raccourcis des tenues"
 
 #: src/gui/setupactiondata.h:709 src/gui/setupactiondata.h:714
 #: src/gui/setupactiondata.h:719 src/gui/setupactiondata.h:724
@@ -2118,7 +2081,7 @@ msgstr ""
 #: src/gui/setupactiondata.h:939 src/gui/setupactiondata.h:944
 #, c-format
 msgid "Outfit Shortcut %d"
-msgstr ""
+msgstr "Raccourci de tenues %d"
 
 #: src/gui/setupactiondata.h:958
 msgid "Toggle Chat"
@@ -2262,7 +2225,7 @@ msgstr "Modifier la touche"
 
 #: src/gui/setupactiondata.h:1151
 msgid "Move Keys"
-msgstr ""
+msgstr "Touches de déplacement"
 
 #: src/gui/setupactiondata.h:1156 src/gui/setupactiondata.h:1435
 msgid "Move Up"
@@ -2282,7 +2245,7 @@ msgstr "Aller à droite"
 
 #: src/gui/setupactiondata.h:1176
 msgid "Move to navigation point shortcuts"
-msgstr ""
+msgstr "Raccourcis de \"aller au point de navigation point\""
 
 #: src/gui/setupactiondata.h:1181 src/gui/setupactiondata.h:1186
 #: src/gui/setupactiondata.h:1191 src/gui/setupactiondata.h:1196
@@ -2310,71 +2273,71 @@ msgstr ""
 #: src/gui/setupactiondata.h:1411 src/gui/setupactiondata.h:1416
 #, c-format
 msgid "Move to point Shortcut %d"
-msgstr ""
+msgstr "Raccourci de \"aller au point de navigation point\" %d"
 
 #: src/gui/setupactiondata.h:1430
 msgid "Move & selection"
-msgstr ""
+msgstr "Déplacement & sélection"
 
 #: src/gui/setupactiondata.h:1455
 msgid "Move Home"
-msgstr ""
+msgstr "Aller au point de repos"
 
 #: src/gui/setupactiondata.h:1460
 msgid "Move End"
-msgstr ""
+msgstr "Arret du déplacement"
 
 #: src/gui/setupactiondata.h:1465
 msgid "Page up"
-msgstr ""
+msgstr "Page précédente"
 
 #: src/gui/setupactiondata.h:1470
 msgid "Page down"
-msgstr ""
+msgstr "Page suivante"
 
 #: src/gui/setupactiondata.h:1480
 msgid "Select"
-msgstr ""
+msgstr "Sélectionner"
 
 #: src/gui/setupactiondata.h:1485
 msgid "Select2"
-msgstr ""
+msgstr "Sélectionner2"
 
 #: src/gui/setupactiondata.h:1500
 msgid "Backspace"
-msgstr ""
+msgstr "Backspace"
 
 #: src/gui/setupactiondata.h:1505
 msgid "Insert"
-msgstr ""
+msgstr "Insérer"
 
 #: src/gui/setupactiondata.h:1510
 msgid "Tab"
-msgstr ""
+msgstr "Tab"
 
 #: src/gui/setupactiondata.h:1515
 msgid "Mod"
-msgstr ""
+msgstr "Modif."
 
 #: src/gui/setupactiondata.h:1541
 msgid "Basic"
-msgstr ""
+msgstr "Basique"
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr "Fenêtres"
 
 #: src/gui/setupactiondata.h:1545
 msgid "Emotes"
-msgstr ""
+msgstr "Emoticones"
 
 #: src/gui/setupactiondata.h:1549
 msgid "Gui"
-msgstr ""
+msgstr "Interface utilisateur (IU)"
 
 #: src/gui/setup_audio.cpp:44
 msgid "(no sound)"
@@ -2414,27 +2377,27 @@ msgstr "Volume de la musique"
 
 #: src/gui/setup_audio.cpp:82
 msgid "Audio frequency"
-msgstr ""
+msgstr "Fréquence audio"
 
 #: src/gui/setup_audio.cpp:86
 msgid "mono"
-msgstr ""
+msgstr "Mono"
 
 #: src/gui/setup_audio.cpp:87
 msgid "stereo"
-msgstr ""
+msgstr "Stéréo."
 
 #: src/gui/setup_audio.cpp:88
 msgid "surround"
-msgstr ""
+msgstr "Surround"
 
 #: src/gui/setup_audio.cpp:89
 msgid "surround+center+lfe"
-msgstr ""
+msgstr "surround+centre+lfe"
 
 #: src/gui/setup_audio.cpp:90
 msgid "Audio channels"
-msgstr ""
+msgstr "Canaux audio"
 
 #: src/gui/setup_audio.cpp:94
 msgid "Sound effects"
@@ -2514,7 +2477,7 @@ msgstr "Limites"
 
 #: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
-msgstr "Limiter le nbre max de car d'une ligne de discussion"
+msgstr "Limiter le nbre max de car de la ligne de discussion"
 
 #: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
@@ -2550,7 +2513,7 @@ msgstr "Placer tous les messages privés dans des onglets"
 
 #: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
-msgstr "Messages de magie dans l'onglet de déboguage"
+msgstr "Messages de magie dans l'onglet de débogage"
 
 #: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
@@ -2558,7 +2521,7 @@ msgstr "Afficher les messages du serveur dans l'onglet de déboguage"
 
 #: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
-msgstr "Activer la boite de dialogue d'échanges"
+msgstr "Activer l'onglet échanges"
 
 #: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
@@ -2657,7 +2620,7 @@ msgstr "Désassigner"
 
 #: src/gui/setup_input.cpp:132
 msgid "Reset all keys"
-msgstr ""
+msgstr "Réinitialiser  toutes les touches"
 
 #: src/gui/setup_input.cpp:135
 msgid "Default"
@@ -2678,7 +2641,7 @@ msgstr ""
 
 #: src/gui/setup_input.cpp:351
 msgid "unknown"
-msgstr ""
+msgstr "inconnu"
 
 #: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
@@ -2789,159 +2752,171 @@ msgid "Attack while moving"
 msgstr "Attaquer en bougeant"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr "Attaquer la prochaine cible"
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "Synchroniser les mouvements du joueur"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "Programme A de mouvement de fou"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "Joueur"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
-msgstr "Afficher votre propre barre de vie"
+msgstr "Afficher votre propre barre de vie "
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "Activer les statistiques instantanées"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "Sélectionner les joueurs par ordre de distance"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "Afficher les expériences de compétences"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "Afficher les pop-ups des joueurs"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr "Message d'absence"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "Afficher les compétences"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr "Activer le mode attaque"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
+msgstr "Activer le filtre de ramassage"
+
+#: src/gui/setup_other.cpp:143
 msgid "Enable advert protocol"
 msgstr "Lancer le protocole d'avertissements"
 
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Accepter les requêtes d'achat et de vente"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "Activer le mode boutique"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "Enregistrer les conversations des PNJ"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr "Support des bots"
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr "Activer le bot d'enchères"
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 "Activer le support du bot de guilde et désactiver le support par défault"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
-msgstr ""
+msgstr "Clavier"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
-msgstr ""
+msgstr "Délai de répétition"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
-msgstr ""
+msgstr "Intervalle de répétition"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr "Toujours montrer"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr "Cacher en basse résolution"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr "Toujours cacher automatiquement"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr "Boutons de raccourcis"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr "Serveur proxy"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr "Système proxy"
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr "Connection directe"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr "Nom d'hôte SOCKS5"
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr "Type de proxy"
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr "Adresse du proxy:port"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Activer le testeur de robots"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Active la protection pour serveurs defaillant (ne pas désactiver)"
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "Activer l'enregistrement des informations de déboguage"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "Mode traffic faible"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr "Cacher le bouclier"
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utiliser FBO pour les captures d'écran (seulement pour OpenGL)"
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Montrer le fond"
 
@@ -2997,15 +2972,15 @@ msgstr "Désactiver la mise en cache des créatures"
 
 #: src/gui/setup_perfomance.cpp:93
 msgid "Different options (enable or disable can improve perfomance)"
-msgstr ""
+msgstr "Options différentes (le choix peut affecter la performance)"
 
 #: src/gui/setup_perfomance.cpp:96
 msgid "Enable texture compression (fast OpenGL)"
-msgstr ""
+msgstr "Activer la compression de texture (fast OpenGL)"
 
 #: src/gui/setup_perfomance.cpp:99
 msgid "Enable rectangular texture extension (OpenGL)"
-msgstr ""
+msgstr "Activer l'extension de texture rectangulaire (OpenGL)"
 
 #: src/gui/setup_players.cpp:53
 msgid "Show gender"
@@ -3025,7 +3000,7 @@ msgstr "Activer le mode de visée étendu de la souris"
 
 #: src/gui/setup_players.cpp:65
 msgid "Target dead players"
-msgstr "Cibler les joueurs morts"
+msgstr "Viser les joueurs morts"
 
 #: src/gui/setup_players.cpp:68
 msgid "Visible names"
@@ -3101,7 +3076,7 @@ msgstr "Relations"
 
 #: src/gui/setup_relations.cpp:269
 msgid "When ignoring:"
-msgstr "Quand ignoré :"
+msgstr "Quand vous ignorez :"
 
 #: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
@@ -3367,7 +3342,7 @@ msgstr "Texte"
 
 #: src/gui/setup_visual.cpp:65
 msgid "Bubbles, no names"
-msgstr "Bulles sans noms"
+msgstr "Bulles, sans noms"
 
 #: src/gui/setup_visual.cpp:66
 msgid "Bubbles with names"
@@ -3383,7 +3358,7 @@ msgstr "aucun"
 
 #: src/gui/setup_visual.cpp:72 src/gui/setup_visual.cpp:81
 msgid "low"
-msgstr "léger"
+msgstr "bas"
 
 #: src/gui/setup_visual.cpp:73 src/gui/setup_visual.cpp:83
 msgid "high"
@@ -3403,7 +3378,7 @@ msgstr "moyen"
 
 #: src/gui/setup_visual.cpp:84
 msgid "max"
-msgstr "max"
+msgstr "max."
 
 #: src/gui/setup_visual.cpp:85
 msgid "Particle detail"
@@ -3411,19 +3386,19 @@ msgstr "Détail des particules"
 
 #: src/gui/setup_visual.cpp:90
 msgid "best quality"
-msgstr ""
+msgstr "qualité max."
 
 #: src/gui/setup_visual.cpp:91
 msgid "normal"
-msgstr ""
+msgstr "normal"
 
 #: src/gui/setup_visual.cpp:92
 msgid "best perfomance"
-msgstr ""
+msgstr "performance max."
 
 #: src/gui/setup_visual.cpp:93
 msgid "Particle physics"
-msgstr ""
+msgstr "Physique des particules"
 
 #: src/gui/setup_visual.cpp:98
 msgid "Gamma"
@@ -3439,7 +3414,7 @@ msgstr "Vsync"
 
 #: src/gui/setup_visual.cpp:109
 msgid "Center game window"
-msgstr ""
+msgstr "Centrer la fenêtre de jeu"
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -3475,7 +3450,7 @@ msgstr "Demande d'échange"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s souhaite %s %s Acceptez-vous ?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Compétences"
 
@@ -3554,179 +3529,194 @@ msgstr "Quitter la guilde ?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Groupe"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter l'utilisateur %s dans le groupe."
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Vous avez demandé à quitter le groupe %s."
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr "Inviter un joueur dans le groupe"
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Qui voudriez vous inviter dans le groupe %s ?"
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "Quitter le groupe ?"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 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:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr "Atq"
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr "Monstres prioritaires"
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "Attaquer les monstres"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr "Ignorer les monstres"
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "Créer une Guilde"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "Créer un groupe"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr "F"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "Choisissez le nom de la guilde."
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
 "dans une."
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, 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:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
 "dans un groupe."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, 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:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, 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:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 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:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr "Nom du groupe"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "Choisissez le nom du groupe."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "Cpt. spéciales"
 
@@ -4291,79 +4281,79 @@ msgstr "Commande : /unignore <joueur>"
 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:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr "TdR"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "Testeur de robot"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr "OnL"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "Qui est en ligne"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr "Sta"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "Émoticône"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Statut"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr "Equ"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr "Inv"
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr "Cmp"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr "Spe"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr "Soc"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr "Rac"
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr "Sor"
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr "Jet"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "Le savez-vous ?"
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "Cfg"
 
@@ -4379,7 +4369,7 @@ msgstr "Changer de Compte"
 msgid "Choose World"
 msgstr "Choix du monde"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr "touche_%d"
@@ -4401,7 +4391,7 @@ msgid "JB%d"
 msgstr "JB%d"
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr "touche u"
 
@@ -4413,342 +4403,342 @@ msgstr "Entrepôt"
 msgid "Cart"
 msgstr "Panier"
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr "Tu as été tué par %s"
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
 msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr "xp"
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr "job"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr "(c) mouvements un peu fous"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr "(C) mouvements complètements fous"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr "(?) déplacement inconnu"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) mouvement de fou numéro %d"
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr "(a) mouvements fous personnalisés"
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr "(?) mouvements fous"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Aller à la cible distante de 1"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Aller à la cible jusqu'à 2 de distance"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr "(3)  Aller à la cible distante de 3"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr "(5)  Aller à la cible distante de 5"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Aller à la cible distante de 7"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr "(a) Portée de l'attaque des archers"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?) Aller à la cible"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un toutou"
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr "(?) Suivre : mode inconnu"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) Attaque"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) Attaquer sans bouclier"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S) Attaquer avec bouclier"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?) Ramassage"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) Vue de la carte vide"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) Sorts d'attaque"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr "(a) attaque tous les joueurs"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr "(f) attaquer tous, sauf les amis"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr "(b) attaque les mauvaises relations"
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr "(d) Ne pas attaquer les joueurs"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr "(?) attaque en PVP"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) Absent"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) Absent"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr "Les modificateurs de jeux sont inconnus"
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr "Vous voyez  "
 
@@ -6055,15 +6045,15 @@ msgstr "Portée de l'attaque"
 msgid "Damage per sec."
 msgstr "Dommage par s."
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr "Impossible de connecter au serveur \""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr "Connexion au serveur terminée."
 
diff --git a/po/he.po b/po/he.po
index 61f8743fb..c785a2d79 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "מתעלם מהצעות סחר נכנסות"
 msgid "Accepting incoming trade requests"
 msgstr "מאשר הצעות סחר נכנסות"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "הגדרות"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "וידאו"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "שגיאה ביצירת ספריית העדכונים!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "האפשרויות עבור /%s הינם \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "כללי"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "שגיאת רשת"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "שגיאה בעת טעינת %s"
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr "שם"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "תקוף"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "דבר"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr "אפס"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "קנה"
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr "מקסימום"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "חנות"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "מכר"
 
@@ -475,18 +474,18 @@ msgstr "מכר"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "צור"
 
@@ -607,7 +606,7 @@ msgstr "נקבה"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr "שיחה"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "לוחש אל %s: %s"
@@ -776,13 +775,9 @@ msgstr "כן"
 msgid "No"
 msgstr "לא"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "סגור"
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "לבוש"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "הורד"
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "ציוד"
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "השתמש"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "השתמש"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "פצל"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr "משקל:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "אחסן"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "החזר"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "השלך"
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr "שלח"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "סחרר"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "שחקנים"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "החלף שרת"
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr "בקשה למסחר"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "כישורים"
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "חבורה"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr "צור גילדה"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr "התקבלה הזמנה לחבורה, אך הזמנה זהה כבר קיימת."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s הזמין אותך לחבורה שלהם."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s הזמין אותך להצטרף לחבורת %s."
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr "אשר את הזמנת חבורה"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "מצב"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 8c9e0e935..ee882e326 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Slika"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -332,35 +332,35 @@ msgstr ""
 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:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Općenito"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
@@ -394,20 +394,20 @@ msgid "Name"
 msgstr "Ime"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Napad"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Govori"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -420,8 +420,8 @@ msgid "Reset"
 msgstr "Poništi"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Kupi"
 
@@ -465,14 +465,13 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Trgovina"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Prodaj"
 
@@ -480,18 +479,18 @@ msgstr "Prodaj"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -597,7 +596,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "Stvori"
 
@@ -612,7 +611,7 @@ msgstr "Žensko"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -768,7 +767,7 @@ msgstr "Chat"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -781,13 +780,9 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -952,7 +947,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvori"
 
@@ -998,13 +993,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Oprema"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Skini opremu"
 
@@ -1032,7 +1027,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Zalihe"
@@ -1046,31 +1041,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Opremi"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Upotrijebi"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Razdvoji"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1079,18 +1074,18 @@ msgid "Weight:"
 msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Ispusti"
 
@@ -1139,7 +1134,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1337,11 +1332,11 @@ msgid "Submit"
 msgstr "Dostavi"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1363,7 +1358,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1376,362 +1371,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Trgovanje"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Igrači"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Promijeni poslužitelj"
@@ -2354,11 +2317,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2781,158 +2744,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3456,7 +3431,7 @@ msgstr "Zahtjev za Trgovanje"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Vještine"
 
@@ -3535,175 +3510,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Partija"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr "Formiraj Ceh"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, 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:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4260,79 +4247,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Stanje"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4348,7 +4335,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4370,7 +4357,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4382,42 +4369,42 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4425,300 +4412,300 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5393,36 +5380,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5976,15 +5963,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 401e6ecf2..3d62dc670 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Kereskedési kérelmek elutasítása"
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Videó"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Általános"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr "Név"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Támadás"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Csevegés"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr "Alaphelyzet"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Vétel"
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Üzlet"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Eladás"
 
@@ -475,18 +474,18 @@ msgstr "Eladás"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "Létrehozás"
 
@@ -607,7 +606,7 @@ msgstr "Nő"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr "Chat"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
@@ -776,13 +775,9 @@ msgstr "Igen"
 msgid "No"
 msgstr "Nem"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Bezár"
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Felszerelés"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Nem használ"
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Táska"
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Használ"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Bevet"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Felosztás"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr "Súly:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Eldob"
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr "Küldés"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "Gépjátékos"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Üzlet"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Játékosok"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Szerver változtatása"
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr "Üzleti ajánlat"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Képességek"
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Csapat"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr "Klán létrehozása"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s a csapatába hívott."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Státusz"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 47c296d2c..0a79d5193 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/"
 "language/id/)\n"
@@ -29,7 +29,7 @@ msgstr "Abaikan permohonan transaksi"
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
@@ -46,56 +46,56 @@ msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -105,50 +105,50 @@ msgstr "Pergantian server"
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -328,35 +328,35 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Umum"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -390,20 +390,20 @@ msgid "Name"
 msgstr "Nama"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Pukul"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Berbicara"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Jalan"
 
@@ -416,8 +416,8 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Beli"
 
@@ -461,14 +461,13 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Toko"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Jual"
 
@@ -476,18 +475,18 @@ msgstr "Jual"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -593,7 +592,7 @@ msgid "Race:"
 msgstr "Ras:"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "Buat"
 
@@ -608,7 +607,7 @@ msgstr "Perempuan"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Lainnya"
 
@@ -777,13 +776,9 @@ msgstr "Ya"
 msgid "No"
 msgstr "Tidak"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Abaikan"
 
@@ -948,7 +943,7 @@ msgstr "Apakah kamu tahu?"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tutup"
 
@@ -994,13 +989,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Perlengkapan"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Lepaskan"
 
@@ -1028,7 +1023,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Perbekalan"
@@ -1042,31 +1037,31 @@ msgid "Filter:"
 msgstr "Penyaring:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Pakai"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Gunakan"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Buang..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Pecah"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Setelan"
 
@@ -1075,18 +1070,18 @@ msgid "Weight:"
 msgstr "Berat"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Simpan"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Kembalikan"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Buang"
 
@@ -1135,7 +1130,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Berat: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Stat membunuh"
 
@@ -1329,11 +1324,11 @@ msgid "Submit"
 msgstr "Masukan"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Hapus"
 
@@ -1355,7 +1350,7 @@ msgid "Outfit: %d"
 msgstr "Setelan: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Kunci: %s"
@@ -1368,362 +1363,330 @@ msgstr "Copot lebih dahulu"
 msgid "Away outfit"
 msgstr "Setelan saat bepergian"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Tukar"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "Berbisik"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "Menyembuhkan"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "Jadikan teman"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "Hapus"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr "Batalkan pengabaian"
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "Mengikuti"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "Tirukan"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr "Undang ke kelompok"
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "Keluarkan dari kelompok"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "keluarkan  pemain"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr "Sembunyikan"
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "Perlihatkan item"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "Tanggalkan pakaian"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "Penambahan komentar"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "Beli(?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "Jual(?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "keluarkan"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr "Hapus dari daftar menyerang"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr "Tambahkan prioritas daftar menyerang"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr "Tambahkan ke daftar menyerang"
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr "Tambahkan ke daftar Abaikan"
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr "Tambahkan nama ke Obrolan"
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Pemain"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "Keluarkan dari kelompok"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Ambil"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Ambil ke obrolan"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Daftar barang"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Ganti nama"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "Hapus"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Mantra"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "Memuat mantra lama"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "Edit mantra"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "hapus nama"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr "Undang ke kelompok"
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Nama:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "Komentar pemain"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "komentar"
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Tambahkan semua ke Penukaran"
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Masukkan 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Masukkan setengah"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Masukkan semua"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "Buang semuanya"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Muat jalan pintas iItem lama"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Sembunyikan"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Tampilkan"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(kembalikan)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "Bergerak keatas"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "Tanggalkan pakaian"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "Jadikan teman"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "Hapus"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr "Batalkan pengabaian"
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "Mengikuti"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "Tirukan"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "Beli(?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "Jual(?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "Perlihatkan item"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Ganti Server"
@@ -2346,11 +2309,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2773,158 +2736,170 @@ msgid "Attack while moving"
 msgstr "Menyerang ketika berjalan"
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "Program Crazy move A"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "Pemain"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "Tampilkan hp bar sendiri"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "Siklus target pemain"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "Tampilkan pesan exp job"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "Tampilkan popup pemain"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr "Pesan saat meninggalkan keyboard"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "Perlihatkan Job"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr "Perbolehkan Penyaring Serangan"
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Terima permintaan jual/beli"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "Perbolehkan mode Jual"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "Riwayat dialog NPC"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Perbolehkan pengecekan bot"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
@@ -3448,7 +3423,7 @@ msgstr "Meminta untuk menukar"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s ingin %s %s apakah anda bersedia?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Keahlian"
 
@@ -3527,175 +3502,190 @@ msgstr "Tinggalkan organisasi?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Kelompok"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Pengguna yang diajak %s ke kelompok"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr "Mengundang pengguna ke kelompok"
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr "Sedang meninggalkan keyboard"
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr "mob prioritas"
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "serang mob"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr "Abaikan mobs"
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4250,79 +4240,79 @@ msgstr "perintah: /unignore <nama pemain>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "Emotikon"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "Apakah kamu tahu"
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4338,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4360,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4372,341 +4362,341 @@ msgstr "Tempat penyimpanan"
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) jalan normal"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?)bergerak ke target"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?)serangan"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) pukulan normal"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti pukulan tanpa pelindung"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S) pukulan dengan pelindung"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?)mengambil"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) penampilan peta kosong"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b)penampilan peta hitam & putih"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magic"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magic"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magic"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magic"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magic"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) serangan magic"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) pergi"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) pergi"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr "Perombakan game tidak diperbolehkan"
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5965,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index a265f3065..af6aa18d3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "Le richieste di scambio in arrivo saranno ignorate"
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -46,56 +46,56 @@ msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Accesso all'account"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -105,50 +105,50 @@ msgstr "Cambiamento server del gioco"
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Cambia password"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Cambia Email"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
@@ -330,35 +330,35 @@ msgstr ""
 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\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Generale"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Screenshot salvato come"
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Errore di rete"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "Impossibile caricare la mappa."
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
@@ -392,20 +392,20 @@ msgid "Name"
 msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Attacco"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Parla"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Movimento"
 
@@ -418,8 +418,8 @@ msgid "Reset"
 msgstr "Reimposta"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Compra"
 
@@ -463,14 +463,13 @@ msgid "Max"
 msgstr "Massimo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Negozio"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Vendi"
 
@@ -478,18 +477,18 @@ msgstr "Vendi"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -595,7 +594,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "Crea"
 
@@ -610,7 +609,7 @@ msgstr "Femmina"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -766,7 +765,7 @@ msgstr "Chat"
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -779,13 +778,9 @@ msgstr "Sì"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -950,7 +945,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Chiudi"
 
@@ -996,13 +991,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Togli"
 
@@ -1030,7 +1025,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventario"
@@ -1044,31 +1039,31 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Equipaggia"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Usa"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Lascia..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Dividi"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Attrezzatura"
 
@@ -1077,18 +1072,18 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Magazzino"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Lascia"
 
@@ -1137,7 +1132,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Statistiche uccisioni"
 
@@ -1333,11 +1328,11 @@ msgid "Submit"
 msgstr "Invia"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Cancella"
 
@@ -1359,7 +1354,7 @@ msgid "Outfit: %d"
 msgstr "Outfit: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Chiave: %s"
@@ -1372,362 +1367,330 @@ msgstr "Rimuovi prima"
 msgid "Away outfit"
 msgstr "Away outfit"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Commercia"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "Ignora completamente."
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Giocatori"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Spells"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr "Lascia"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Rinomina mappa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Nome:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr "Aggiungi allo scambio"
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Salva 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Salva metà"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Salva tutto"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Carica vecchie scorciatoie oggetti"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Nascondi"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Mostra"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "Ignora completamente."
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Cambia server"
@@ -2350,11 +2313,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2777,158 +2740,170 @@ msgid "Attack while moving"
 msgstr "Attacca in movimento"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "Sincronizza movimenti giocatore"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "Movimento matto \"A\""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "Mostra la mia barra hp"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "Abilita statistiche veloci"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "Ciclo di target sui giocatori"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "Mostra messaggi riguardo all'esperienza - punti lavoro"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "Mostra barra lavoro"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Accetta richieste di vendita/acquisto"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "Abilita la modalità negozio"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "Log dialoghi NPC"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Abilita il bot checker"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "Abilita i log di debug"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "Modalità basso traffico"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr "Nascondi lo scudo"
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Mostra sfondo"
 
@@ -3452,7 +3427,7 @@ msgstr "Richiesta di commercio"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vuole %s %s accetti?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Abilità"
 
@@ -3531,175 +3506,187 @@ msgstr "Lasciare la gilda?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Sei sicuro di voler lasciare la gilda %s?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Invitato utente al gruppo %s"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Abbandono gruppo %s richiesto"
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr "Invita qualcuno nel gruppo"
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Chi vorresti invitare al gruppo %s?"
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "Lasciare il gruppo?"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Sei sicuro di voler lasciare il gruppo %s?"
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr "Crea una Gilda"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr "Crea gruppo"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Sociale"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr "Invita"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accettato invito al gruppo da parte di %s"
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rifiutato invito al gruppo da parte di %s"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accettato invito alla gilda da parte di %s"
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rifiutato invito alla gilda da parte di %s"
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Stai creando una gilda chiamata %s"
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr "Stai creando un party chiamato %s"
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr "Nome della gilda"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr "Scegli un nome per la tua gilda"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr "Ricevuto invito ad una gilda, ma ne hai già una."
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s ti ha invitato ad entrare nella gilda %s"
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr "Accetta invito alla gilda"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr "Sei stato invitato ad entrare in un party"
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sei stato invitato ad entrare nel gruppo %s"
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, 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:1619
+#: src/gui/socialwindow.cpp:1560
 #, 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:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossibile creare un party, sei già in un party"
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr "Nome del gruppo"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr "Scegli un nome per il tuo party"
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "Speciali"
 
@@ -4256,79 +4243,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr "Questo comando smette di ignorare l'altro giocatore se è stato ignorato in precedenza"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "Bot checker"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "Chi è online"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr "KS"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Stato"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr "SKI"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr "SH"
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr "SP"
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr "DR"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "SET"
 
@@ -4344,7 +4331,7 @@ msgstr "Cambia login"
 msgid "Choose World"
 msgstr "Scegli parola"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4366,7 +4353,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4378,342 +4365,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "L'oggetto è troppo pesante"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "L'inventario è pieno"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Hai raccolto %d  [@@%d|%s@@]."
 msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "Assente"
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5388,36 +5375,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5971,15 +5958,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index b3d467291..ed209845c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/"
 "language/ja/)\n"
@@ -31,7 +31,7 @@ msgstr "トレードリクエストを無効にしています"
 msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
@@ -48,56 +48,56 @@ msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "パフォーマンス"
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr "テーマ"
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "ログインしています"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -107,50 +107,50 @@ msgstr "ゲームサーバーを変更しています"
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう"
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません"
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:%s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません"
@@ -330,35 +330,35 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr " としてスクリーンショットを保存しました"
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました"
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "マップの読み込みに失敗しました"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sの読み込み中にエラーが起きました"
@@ -392,20 +392,20 @@ msgid "Name"
 msgstr "名前"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "攻撃"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "話す"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "動く"
 
@@ -418,8 +418,8 @@ msgid "Reset"
 msgstr "リセット"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "買う"
 
@@ -463,14 +463,13 @@ msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "売る"
 
@@ -478,18 +477,18 @@ msgstr "売る"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -595,7 +594,7 @@ msgid "Race:"
 msgstr "人種:"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "作成"
 
@@ -610,7 +609,7 @@ msgstr "女性"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "その他"
 
@@ -779,13 +778,9 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "無視"
 
@@ -950,7 +945,7 @@ msgstr "豆知識"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "閉じる"
 
@@ -996,13 +991,13 @@ msgstr "詳細:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "サーバーアドレスとポートを入力して下さい"
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "装着品"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "取外す"
 
@@ -1030,7 +1025,7 @@ msgstr "数量"
 msgid "by type"
 msgstr "タイプ"
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "インベントリー"
@@ -1044,31 +1039,31 @@ msgid "Filter:"
 msgstr "フィルタ:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "装着"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "落とす..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "分割"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "服装"
 
@@ -1077,18 +1072,18 @@ msgid "Weight:"
 msgstr "重量:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "保管"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "取出す"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "落とす"
 
@@ -1137,7 +1132,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "重力: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "キル統計"
 
@@ -1331,11 +1326,11 @@ msgid "Submit"
 msgstr "決定"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "クリア"
 
@@ -1357,7 +1352,7 @@ msgid "Outfit: %d"
 msgstr "服装: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "鍵: %s"
@@ -1370,362 +1365,330 @@ msgstr "最初に取外す"
 msgid "Away outfit"
 msgstr "AFK中の服装"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "トレード"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "ささやく"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "HP回復"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "友達になる"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr "無視する"
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr "ブラックリスト"
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr "敵に設定する"
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "消す"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr "完全無視解除"
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "完全無視"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "フォロー"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "真似"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr "パーティへ招待"
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "パーティから一時的に追い出す"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "ギルドから一時的に追い出す"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr "ギルドでの役割を変更"
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr "ギルドへ招待"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "プレイヤーを一時的に追い出す"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr "消す"
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "アイテムを表示する"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "脱ぐ"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "コメントをする"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "買う (?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "売る (?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "追い出す"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr "攻撃リストから削除する"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr "攻撃優先リストへ追加する"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr "攻撃リストへ追加する"
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr "名前をチャットへ追加する"
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "プレイヤー"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "パーティから一時的に追い出す"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "拾う"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "チャットに追加"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "マップアイテム"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "名前を変更する"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "削除"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr "ワープ"
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr "カメラを動かす"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "呪文"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "古い呪文を読込む"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "呪文を編集する"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr "名前を消さない"
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "名前を削除する"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "AFKを有効にする"
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "退会"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr "パーティへ招待"
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "          マップサインの名前を変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "名前:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "プレイヤーコメント            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "コメント:                      "
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "10 保存"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "半分保存"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "全部保存"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "全て落とす"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "半分取出す"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "全部取出す"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "旧アイテムショートカットを読込む"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr " 非表示"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "表示"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "上へ移動"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "下へ移動"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "脱ぐ"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "友達になる"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr "無視する"
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr "ブラックリスト"
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr "敵に設定する"
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "消す"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr "完全無視解除"
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "完全無視"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "フォロー"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "真似"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "買う (?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "売る (?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "アイテムを表示する"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "サーバーを変更する"
@@ -2348,11 +2311,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr "ウィンドウ"
 
@@ -2777,158 +2740,170 @@ msgid "Attack while moving"
 msgstr "移動中も攻撃する"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "プレイヤーの動きを同化する"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "クレイジームーブ A プログラム"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "プレイヤー"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "自分のHPバーを表示する"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "クイックスタッツを有効にする"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "選択したプレイヤーを円で表示"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "ジョブExpメッセージを表示する"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "プレイヤーポップアップを表示する"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr "AFKメッセージ"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "ジョブを表示する"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr "攻撃フィルターを有効にする"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:143
 msgid "Enable advert protocol"
 msgstr "アドバートプロトコルを有効にする"
 
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "売買リクエストを受け入れる"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "ショップモードを有効にする"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "NPCダイアログを記録する"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr "ボットサポート"
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr "オークションボットのサポート"
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr "ギルドサポートを無効にしギルドボットを有効にする"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr "サーバーサイドアタックを有効にする"
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "ボットチェッカーを有効にする"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "不安定なサーバー保護を有効にする(無効にしない)"
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "デバッグログを有効にする"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "低トラフィックモード"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr "シールドスプライトを隠す"
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "スクリーンショットにFBOを使う (OpenGLのみ)"
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "背景を表示する"
 
@@ -3455,7 +3430,7 @@ msgstr "トレードをリクエスト"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%sが%s %sを希望しています。承認しますか？"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "スキル"
 
@@ -3534,175 +3509,190 @@ msgstr "ギルドから退会しますか？"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "ギルド %sから本当に退会しますか?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "パーティー"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "ユーザー %s をパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr "パーティ %sへ退会届を出しました"
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr "メンバーをパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "パーティ %sに誰を招待しますか?"
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "パーティーから退会しますか？"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "パーティ %sから本当に退会しますか?"
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr "ナビ"
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr "攻撃"
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr "優先される敵"
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "敵を攻撃する"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr "無視している敵"
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "ギルドを作成する"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "パーティを作る"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "ソーシャル"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "招待"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr "周囲"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr "友達"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%sからのパーティ招待を承認しました"
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからのパーティ招待を拒否しました"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからのギルド招待を承認しました"
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからのギルド招待を拒否しました"
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド %sを作成しました"
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "パーティ %sを作成しました"
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "ギルド名"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "ギルド名を選んでください"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr "ギルド招待を承認したが既に入会しています"
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%sがギルド %sへ招待しています"
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "ギルド招待を受け入れる"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr "パーティ招待を承認したが既に入会しています"
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "パーティに招待されました"
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "パーティ %sに招待されました"
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%sはあなたをパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 msgid "Cannot create party. You are already in a party"
 msgstr "パーティーを作成することはできません。もうパーティーに入っています"
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr "パーティ名"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください"
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "スペシャル"
 
@@ -4263,79 +4253,79 @@ msgstr "コマンド: /unignore <プレイヤー名>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "このコマンドはプレイヤー完全無視を解除します"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "ボットチェッカー"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "オンラインリスト"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr "KS"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "スマイリー"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "ステータス"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr "SKI"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr "SH"
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr "SP"
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr "DR"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "豆知識"
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "SET"
 
@@ -4351,7 +4341,7 @@ msgstr "ログインの変更"
 msgid "Choose World"
 msgstr "世界の選択"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr "キー_%d"
@@ -4373,7 +4363,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr "u キー"
 
@@ -4385,341 +4375,341 @@ msgstr "倉庫"
 msgid "Cart"
 msgstr "カート"
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr "%sによって殺されました"
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません"
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr "量が多すぎます"
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません"
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "%d [@@%d|%s@@]を手に入れました"
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr "xp"
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr "ジョブ"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) デフォルトムーブ"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr "(I) 逆ムーブ"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr "(c) クレイジームーブを含んだムーブ"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr "(C) クレイジームーブ"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) ダブルノーマル + クレイジー"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr "(?) 不明なムーブ"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) クレイジームーブ %d"
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr "(a) カスタムクレイジームーブ"
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr "(?) クレイジームーブ"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr "(0) ターゲットへデフォルト接近"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr "(1) 距離1でターゲットへ接近"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) 距離2でターゲットに近付く"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr "(3) 距離3でターゲットへ接近"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr "(5) 距離5でターゲットに近付く"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr "(7) 距離7でターゲットに近付く"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr "(A) 攻撃範囲内のターゲットに近付く"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr "(a) 弓師攻撃範囲"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?) ターゲットに近付く"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr "(D) デフォルトフォロー"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr "(R) 友達フォロー"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr "(M) ミラーフォロー"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr "(P) ペットフォロー"
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr "(?) 不明なフォロー"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) 攻撃"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) デフォルト攻撃"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) 盾なし攻撃"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S) 盾あり攻撃"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) 接近、攻撃"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) 接近、攻撃、拾う"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) 自動攻撃なし"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) 小範囲で拾う 1x1セル"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) デフォルト範囲で拾う 2x1セル"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 広範囲で拾う 2x3セル"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3セルの範囲で拾う"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) 距離4の範囲で拾う"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) 距離8で拾う"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr "(A) 最大範囲で拾う"
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?) 拾う"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) 通常マップビュー"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr "(D) デバッグマップビュー"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr "(u) ウルトラマップビュー"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr "(U) ウルトラマップビュー2"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) 空マップビュー"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b) 白黒マップビュー"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) 魔法攻撃は #flarを使う"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) 魔法攻撃は #chizaを使う"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) 魔法攻撃は #ingravを使う"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) 魔法攻撃は #frillyarを使う"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) 魔法攻撃は #upmarmuを使う"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) 魔法攻撃"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr "(a) 全てのプレイヤーを攻撃"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr "(f) 友達以外を攻撃"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr "(b) 敵を攻撃"
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr "(d) 他のプレイヤーを攻撃しない"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr "(?) PvP攻撃"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr "(D) デフォルト真似"
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr "(O) 服装真似"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr "(?) 真似をする"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "アウェイ"
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) キーボード"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) アウェイ"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) アウェイ"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr "(G) ゲームカメラモード"
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr "(F) フリーカメラモード"
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr "ゲームモディファイアは有効になってます"
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr "ゲームモディファイアは無効になってます"
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr "不明なゲームモディファイア"
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "フォロー: "
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr "真似: "
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr " が見える"
 
@@ -5988,15 +5978,15 @@ msgstr "攻撃距離"
 msgid "Damage per sec."
 msgstr "ダメージ/秒"
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "ネットワークに空のアドレスが送信されました::connect()!"
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr "ホスト名を解決できません"
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr "サーバーへの接続が切断されました "
 
diff --git a/po/ka.po b/po/ka.po
index 925cb45a3..8ae1ca594 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -322,35 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,20 +384,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -410,8 +410,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -455,14 +455,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -470,18 +469,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -587,7 +586,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr ""
 
@@ -602,7 +601,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -758,7 +757,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -771,13 +770,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -942,7 +937,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -988,13 +983,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1022,7 +1017,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1036,31 +1031,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1069,18 +1064,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1129,7 +1124,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1323,11 +1318,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1349,7 +1344,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1362,362 +1357,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2340,11 +2303,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2767,158 +2730,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3442,7 +3417,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3521,175 +3496,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4246,79 +4233,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4334,7 +4321,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4356,7 +4343,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4368,341 +4355,341 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5377,36 +5364,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5960,15 +5947,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 842520492..0aa696776 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: 2012-04-28 15:55+0300\n"
+"POT-Creation-Date: 2012-05-12 15:59+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"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -475,18 +474,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr ""
 
@@ -607,7 +606,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -776,13 +775,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3528,175 +3503,190 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4251,79 +4241,79 @@ msgstr ""
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4339,7 +4329,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4361,7 +4351,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4373,342 +4363,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5965,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 3d1ffeb51..42f7e302b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "Feil"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Generelt"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Lagring av skjermbilde feilet!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Feil i lastingen av %s"
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr "Navn"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr "Tilbakestill"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Kjøp"
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr "Maks"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Butikk"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Selg"
 
@@ -475,18 +474,18 @@ msgstr "Selg"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "Lag"
 
@@ -607,7 +606,7 @@ msgstr "Kvinne"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -776,13 +775,9 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nei"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Lukk"
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Utstyr"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Bruk"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Del opp"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr "Vekt:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr "Bekreft"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Spillere"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Ferdigheter"
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr "Godta Gruppeinvitasjon"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index f13c55327..9c5542e3f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/manaplus/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Inkomende handelsaanvragen negeren"
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 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:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr "Naam"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Spreken"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Kopen"
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr "Maximum"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -475,18 +474,18 @@ msgstr "Verkopen"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -607,7 +606,7 @@ msgstr "Vrouwelijk"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr "Chat"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -776,13 +775,9 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventaris"
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Splitsen"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Neerleggen"
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr "Indienen"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Spelers"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Van server wisselen"
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr "Handel aanvragen"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Groep"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, 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:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 997d1d5bf..90b04c57f 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/"
 "language/nl_BE/)\n"
@@ -28,7 +28,7 @@ msgstr "Inkomende handelsaanvragen negeren"
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
@@ -45,56 +45,56 @@ msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -104,50 +104,50 @@ msgstr "Wijzigen spelservers"
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -332,35 +332,35 @@ 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:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -394,20 +394,20 @@ msgid "Name"
 msgstr "Naam"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Spreken"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Beweeg"
 
@@ -420,8 +420,8 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Kopen"
 
@@ -465,14 +465,13 @@ msgid "Max"
 msgstr "Maximum"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -480,18 +479,18 @@ msgstr "Verkopen"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -597,7 +596,7 @@ msgid "Race:"
 msgstr "Ras:"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -612,7 +611,7 @@ msgstr "Vrouwelijk"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Andere"
 
@@ -781,13 +780,9 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Negeer"
 
@@ -952,7 +947,7 @@ msgstr "Weet u?"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
@@ -998,13 +993,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -1032,7 +1027,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventaris"
@@ -1046,31 +1041,31 @@ msgid "Filter:"
 msgstr "Filter:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Neerleggen..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Splitsen"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Kleren"
 
@@ -1079,18 +1074,18 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Neerleggen"
 
@@ -1139,7 +1134,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
@@ -1335,11 +1330,11 @@ msgid "Submit"
 msgstr "Indienen"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Wissen"
 
@@ -1361,7 +1356,7 @@ msgid "Outfit: %d"
 msgstr "Kleren: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Sleutel: %s"
@@ -1374,362 +1369,330 @@ msgstr "Verwijder uitrusting eerst"
 msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "Fluister"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "Genees"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "Word vriend"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr "Geen rekening mee houden"
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "Wis"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "Volledig genegeerd"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "Volg"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "Imiteer"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "Schop speler"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "Toon Voorwerpen"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "ontkleed"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "Koop (?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "Verkoop (?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "Schop"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Spelers"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Raap op"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Hernoem"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "Verwijder"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Spreuken"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "Laad oude spreuken"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "Verwijder naam"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "away aanzetten"
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr "away afzetten"
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "Verlaat"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Plaats 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Plaats de helft"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Plaats alles"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Laden van oude voorwerpsnelkoppelingen"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Verberg"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Toon"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(standaard)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "ontkleed"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "Word vriend"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr "Geen rekening mee houden"
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "Wis"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "Volledig genegeerd"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "Volg"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "Imiteer"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "Koop (?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "Verkoop (?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "Toon Voorwerpen"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Van server wisselen"
@@ -2352,11 +2315,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2779,158 +2742,170 @@ msgid "Attack while moving"
 msgstr "Aanvallen tijdens verplaatsen"
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "Speler"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "Toon hp statusbalk van jezelf"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "Zet snelle statistieken aan"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Accepteer koop/verkoop aanvragen"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "shop modus aanzetten"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr "Aanval gecontroleerd door server aanzetten"
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Bot controle aanzetten"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Toon achtergrond"
 
@@ -3460,7 +3435,7 @@ msgstr "Handel aanvragen"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s wilt %s %s ga je akkoord?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -3539,175 +3514,190 @@ msgstr "Verlaten Guild?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bent u zeker dat u guild %s wilt verlaten?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Groep"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gebruiker %s uitgenodigd in groep."
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wie zou u willen uitnodigen in group %s?"
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "Verlaten Groep?"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bent u zeker dat u groep %s wilt verlaten?"
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr "Aanv"
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "Groep aanmaken"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Sociaal"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "Nodig uit"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Maken van guild %s."
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "Maken van groep %s."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "Guild Naam"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "Kies uw guild naam"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om guid %s te vervoegen."
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "U bent uitgenodigd om je bij een groep te voegen."
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "U bent uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, 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:1619
+#: src/gui/socialwindow.cpp:1562
 #, 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:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr "Groep Naam"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "Specialen"
 
@@ -4273,79 +4263,79 @@ msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Dit commando stop met de andere speler te negeren als deze genegeerd werd."
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "Bot controle"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "Wie is online"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr "VAAR"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "WU"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "Weet u"
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "OPT"
 
@@ -4361,7 +4351,7 @@ msgstr "Wijzig Login"
 msgid "Choose World"
 msgstr "Kies Wereld"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4383,7 +4373,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4395,342 +4385,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "U raapte op %d [@@%d|%s@@]."
 msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) standaard bewegingen"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr "(I) geïnverteerde bewegingen"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegingen met vreemde bewegingen"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normaal + raar"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr "(a) manuele vreemde beweging"
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr "(?) vreemde beweging"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr "(0) standaard bewegingen tot aan doel"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bewegen tot aan doel in bereik 1"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegen tot aan doel in bereik 2"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegen tot aan doel in bereik 3"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegen tot aan doel in bereik 5"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegen tot aan doel in bereik 7"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?) beweeg tot aan doel"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr "(D) standaard volgen"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr "(R) relatief volgen"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeld volgen"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr "(P) huisdier volgen"
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr "(?) onbekend volgen"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) aanval"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) standaard aanval"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) wissel aanval zonder schild"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S) wissel aanval met schild"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) ga en val aan"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) ga, val aan, raap op"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) zonder auto aanval"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) klein raap op 1x1 velden"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standaard raap op 2x1 velden"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) vooruit raap op 2x3 velden"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) raap op 3x3 velden"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) go en raap op met bereik 4"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ga en raap op met bereik 8"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ga en raap op zonder bereiklimiet"
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?) raap op"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) normale map tonen"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr "(D) debug map tonen"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr "(u) ultra map tonen"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra map tonen 2"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) lege map tonen"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b) zwart & witte map tonen"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gebruik #flar voor magie aanval"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gebruik #chiza voor magie aanval"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) gebruik #ingrav voor magie aanval"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gebruik #frillyar voor magie aanval"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gebruik #upmarmu voor magie aanval"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) magie aanval"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr "(D) standaard imitatie"
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr "(O) kleren imitatie"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr "(?) imitatie"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "Weg"
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) op toetsenbord"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) weg"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) weg"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr "(G) spel camera modus"
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "Volg: "
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -6010,15 +6000,15 @@ msgstr "Aanvalsbereik"
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Leeg adres gegeven aan Network::connect()!"
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr "Niet mogelijk te resolven van host \""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr "Verbinding met server beëindigd. "
 
diff --git a/po/pl.po b/po/pl.po
index 1a645381f..144c37419 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/language/"
 "pl/)\n"
@@ -29,7 +29,7 @@ msgstr "Ignorowanie przychodzących próśb o handel"
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
@@ -46,56 +46,56 @@ msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Wydajność programu"
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Ekran"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr "Skórki"
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Logowanie"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -105,50 +105,50 @@ msgstr "Zmiana serwera"
 msgid "Error"
 msgstr "Błąd"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy serwer aktualizacji: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
@@ -336,35 +336,35 @@ msgstr "Osierocone obrazy źródłowe:"
 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:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Zrzut ekranu zapisany jako"
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "Nie można załadować mapy"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Błąd podczas łądowania %s"
@@ -398,20 +398,20 @@ msgid "Name"
 msgstr "Imię"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Atak"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Rozmowa"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Podejdź"
 
@@ -424,8 +424,8 @@ msgid "Reset"
 msgstr "Resetuj"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Kup"
 
@@ -469,14 +469,13 @@ msgid "Max"
 msgstr "Maks."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Sklep"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Sprzedaj"
 
@@ -484,18 +483,18 @@ msgstr "Sprzedaj"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -601,7 +600,7 @@ msgid "Race:"
 msgstr "Rasa:"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "Utwórz"
 
@@ -616,7 +615,7 @@ msgstr "Kobieta"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Inne"
 
@@ -785,13 +784,9 @@ msgstr "Tak"
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Ignoruj"
 
@@ -956,7 +951,7 @@ msgstr "Cz wiesz że..."
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zamknij"
 
@@ -1002,13 +997,13 @@ msgstr "Opis:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Wymagany zarówno adres jak i port serwera."
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Ekwipunek"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Zdejmij"
 
@@ -1036,7 +1031,7 @@ msgstr "wg. ilości"
 msgid "by type"
 msgstr "wg. typu"
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inwentarz"
@@ -1050,31 +1045,31 @@ msgid "Filter:"
 msgstr "Filtr:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Załóż"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Użyj"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Upuść..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Podziel"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Stroje"
 
@@ -1083,18 +1078,18 @@ msgid "Weight:"
 msgstr "Waga:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Przechowaj"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Upuść"
 
@@ -1143,7 +1138,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Waga: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Statystyki ataku:"
 
@@ -1181,13 +1176,13 @@ msgstr "Moby: %s, całk. exp: %s"
 #: src/gui/killstats.cpp:220 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s"
-msgstr ""
+msgstr "Śr. Exp: %s"
 
 #: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
 #: src/gui/killstats.cpp:224 src/gui/killstats.cpp:235
 #, c-format
 msgid "No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Przeciętna il mobów do nast.: %s"
 
 #: src/gui/killstats.cpp:84 src/gui/killstats.cpp:163
 #: src/gui/killstats.cpp:242
@@ -1341,11 +1336,11 @@ msgid "Submit"
 msgstr "Zatwierdź"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Wyczyść"
 
@@ -1367,7 +1362,7 @@ msgid "Outfit: %d"
 msgstr "Strój: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Klawisz: %s"
@@ -1380,362 +1375,330 @@ msgstr "Najpierw zdejmij"
 msgid "Away outfit"
 msgstr "Strój na afk"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "Szept"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "Lecz"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "Dodaj do znajomych"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr "Lekceważ"
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr "Czarna lista"
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr "Ustaw jako wroga"
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "Usuń"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr "Odignoruj"
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "Całkowicie ignoruj"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "Podążaj"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "Imituj"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr "Zaproś do grupy"
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "Wyrzuć z grupy"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "Wyrzuć z gildii"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr "Zmień pozycję w gildii"
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr "Zaproś do gildii"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "Wyrzuć gracza"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr "Wysadź w powietrze"
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "Pokaż przedmioty"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "Rozbierz"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "Kup (?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "Sprzedaj (?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "Wyrzuć"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr "Usuń z listy ataku"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr "Dodaj do listy priorytetów"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr "Dodaj do listy atakowanych"
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr "Wpisz do czatu"
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Gracze"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "Wyrzuć z grupy"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Podnieś"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Portal"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "Usuń"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr "Teleport"
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr "Przesuwaj kamerę"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr "Usuń ubiór"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Zaklęcia"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "Przywróć stare zaklęcia"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "Edytuj zaklęcie"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "Wyłącz alarm"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Włącz alarm"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr "Nie usuwaj imion"
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "Usuń imię"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "Włącz tryb AFK"
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr "Wyłącz tryb AFK"
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "Opuść"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr "Zaproś do grupy"
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Zmień nazwę drogowskazu"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Nick:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "Komentarz gracza            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "Komentarz:                      "
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr "Dodaj 10 do handlu"
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr "Dodaj połowę do handlu"
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Przechowaj 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Przechowaj połowę"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Przechowaj wszystko"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Odbierz 10"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Odbierz połowę"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Odbierz wszystko"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Przywróć stare skróty przedmiotów"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Ukryj"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Pokaż"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(domyślne)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "W górę"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "W dół"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "Rozbierz"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "Dodaj do znajomych"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr "Lekceważ"
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr "Czarna lista"
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr "Ustaw jako wroga"
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "Usuń"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr "Odignoruj"
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "Całkowicie ignoruj"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "Podążaj"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "Imituj"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "Kup (?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "Sprzedaj (?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "Pokaż przedmioty"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Zmień serwer"
@@ -1834,7 +1797,7 @@ msgstr "wymaga v%s"
 
 #: src/gui/setupactiondata.h:48
 msgid "Target and attack keys"
-msgstr ""
+msgstr "Klawisze celowania i ataku"
 
 #: src/gui/setupactiondata.h:58
 msgid "Target & Attack"
@@ -1914,7 +1877,7 @@ msgstr "Wybrano OK"
 
 #: src/gui/setupactiondata.h:172
 msgid "Shortcuts modifiers keys"
-msgstr ""
+msgstr "Klawisze skrótów modyfikatorów"
 
 #: src/gui/setupactiondata.h:177
 msgid "Item Shortcuts Key"
@@ -1922,7 +1885,7 @@ msgstr "Klawisz skrótu przedmiotu"
 
 #: src/gui/setupactiondata.h:182
 msgid "Shortcuts keys"
-msgstr ""
+msgstr "Klawisze skrótów"
 
 #: src/gui/setupactiondata.h:187 src/gui/setupactiondata.h:192
 #: src/gui/setupactiondata.h:197 src/gui/setupactiondata.h:202
@@ -2032,15 +1995,15 @@ msgstr "Następna zakładka społeczna"
 
 #: src/gui/setupactiondata.h:420
 msgid "Emote modifiers keys"
-msgstr ""
+msgstr "Klawisze modyfikatorów emotek"
 
 #: src/gui/setupactiondata.h:425
 msgid "Emote modifier key"
-msgstr ""
+msgstr "Klawisz modyfikatora emotek"
 
 #: src/gui/setupactiondata.h:430
 msgid "Emote shortcuts"
-msgstr ""
+msgstr "Skróty emotek"
 
 #: src/gui/setupactiondata.h:435 src/gui/setupactiondata.h:440
 #: src/gui/setupactiondata.h:445 src/gui/setupactiondata.h:450
@@ -2072,7 +2035,7 @@ msgstr "Skrót Emotki %d"
 
 #: src/gui/setupactiondata.h:684
 msgid "Outfits keys"
-msgstr ""
+msgstr "Klawisze ubioru"
 
 #: src/gui/setupactiondata.h:689
 msgid "Wear Outfit"
@@ -2088,7 +2051,7 @@ msgstr "Skopiuj ekwipunek do stroju"
 
 #: src/gui/setupactiondata.h:704
 msgid "Outfits shortcuts"
-msgstr ""
+msgstr "Skróty ubiorów"
 
 #: src/gui/setupactiondata.h:709 src/gui/setupactiondata.h:714
 #: src/gui/setupactiondata.h:719 src/gui/setupactiondata.h:724
@@ -2116,7 +2079,7 @@ msgstr ""
 #: src/gui/setupactiondata.h:939 src/gui/setupactiondata.h:944
 #, c-format
 msgid "Outfit Shortcut %d"
-msgstr ""
+msgstr "Skrót ubioru %d"
 
 #: src/gui/setupactiondata.h:958
 msgid "Toggle Chat"
@@ -2260,7 +2223,7 @@ msgstr "Klawisz modyfikatora"
 
 #: src/gui/setupactiondata.h:1151
 msgid "Move Keys"
-msgstr ""
+msgstr "Klawisze poruszania się"
 
 #: src/gui/setupactiondata.h:1156 src/gui/setupactiondata.h:1435
 msgid "Move Up"
@@ -2358,11 +2321,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "Skróty"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr "Okna"
 
@@ -2787,158 +2750,170 @@ msgid "Attack while moving"
 msgstr "Atakuj podczas poruszania się"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "Synchronizuj ruchy graczy"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "Szalone ruchy: program A"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "Gracze"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "Pokazuj własny pasek życia"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "Włącz szybkie statystyki"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "Przewijaj namierzanie graczy"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "Pokazuj wiadomości o punktach doświadczenia umiejętności"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "Pokazuj wyskakujące powiadomienia graczy"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr "Wiadomość AFK"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "Pokazuj poziom umiejętności"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr "Filtruj ataki"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:143
 msgid "Enable advert protocol"
 msgstr "Włącz protokół reklamowy"
 
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Akceptuj prośby o handel"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "Włącz tryb sklepu"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "Loguj dialogi NPC"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr "Integracja z botami"
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr "Włącz integrację z AuctionBotem"
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Włącz integrację z guild-botem i wyłącz natywną obsługę gildii"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr "Zawsze pokazuj"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr "Autoukrywanie w małej rozdzielczości"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr "Autoukrywanie"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr "Guziki skrótów"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr "Serwer proxy"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr "Proxy systemowe"
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr "Bezpośrednie połączenie"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr "Nazwa hosta SOCKS5"
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr "Rodzaj proxy"
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr "Adres serwera:port"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr "Włącz atak ze strony serwera"
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Włącz wykrywacza botów"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Włącz ochronę przeciw zbugowanym serwerom"
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "Włącz logowanie Debug"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "Tryb niskiego transferu"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr "Chowaj obrazek tarczy"
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Używaj FBO do screenshotów (tylko w OpenGL)"
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Pokazuj tło"
 
@@ -3467,7 +3442,7 @@ msgstr "Prośba o handel"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s%s, akceptujesz?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Zdolności"
 
@@ -3546,175 +3521,190 @@ msgstr "Opuścić gildię?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Na pewno opuścić gildię %s?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupa"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gracz %s zaproszony do grupy."
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Poproszono o wyjście z grupy %s."
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr "Zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kogo chcesz zaprosić do grupy %s?"
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "Opuścić grupę?"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Na pewno opuścić grupę %s?"
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr "GPS"
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr "Atk"
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr "Priorytetowe moby"
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "Atakuj moby"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr "Ignoruj moby"
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "Utwórz gildię"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "Utwórz grupę"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Społeczność"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "Zaproś"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr "V"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr "F"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Akceptowano zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Tworzenie gildii o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "Tworzenie grupy o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "Nazwa gildii"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "Wybierz nazwę gildii."
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr "Gildia o tej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił/a Cię do gildii %s."
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "Akceptuj zaproszenie do gildii"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr "Grupa o takiej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "Zostałeś/aś zaproszony/a do grupy."
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Zostałeś/aś zaproszony/a do grupy %s."
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił/a Cię do grupy."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił/a Cię do grupy %s ."
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 msgid "Cannot create party. You are already in a party"
 msgstr "Nie można utworzyć grupy. Już należysz do grupy."
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr "Nazwa grupy"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "Specjalne"
 
@@ -4271,79 +4261,79 @@ msgstr "Komenda: /unignore <gracz>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "To polecenie przerywa ignorowanie gracza, jeśli był ignorowany."
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr "WB"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "Wykrywacz botów"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "Gracze online"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr "SB"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "Emotki"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Stan"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr "EKW"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr "INW"
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr "SKI"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr "SK"
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr "MG"
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr "UP"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "WŻ"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "Czy wiesz, że..."
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "SET"
 
@@ -4359,7 +4349,7 @@ msgstr "Przeloguj się"
 msgid "Choose World"
 msgstr "Wybierz świat"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
@@ -4381,7 +4371,7 @@ msgid "JB%d"
 msgstr "JB%d"
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr "(nieznany)"
 
@@ -4393,42 +4383,42 @@ msgstr "Magazyn"
 msgid "Cart"
 msgstr "Wózek"
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr "Zostałeś/aś zabity/a przez %s"
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr "Nieznany problem podczas próby podniesienia przedmiotu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4436,300 +4426,300 @@ msgstr[0] "Podniosłeś/aś %d [@@%d|%s@@]."
 msgstr[1] "Podniosłeś/aś %d [@@%d|%s@@]."
 msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr "xp"
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr "skill"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) domyślne poruszanie się"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr "(I) odwrócone ruchy"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr "(c) trochę szalonych ruchów"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr "(C) dużo szalonych ruchów"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) podwójne normalne + szalone"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr "(?) nieznany sposób poruszania się"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) szalone ruchy numer %d"
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr "(a) własne szalone ruchy"
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr "(?) szalone ruchy"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr "(0) domyślne przybliżenie do celu"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr "(1) podejdź do 1 pola od celu"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) podejdź do 2 pól od celu"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr "(3) podejdź do 3 pól od celu"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr "(5) podejdź do 5 pól od celu"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr "(7) podejdź do 7 pól od celu"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr "(A) podejdź do celu na zasięg ataku"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr "(a) zasięg ataku łucznika"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?) pól do celu"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr "(D) domyślne podążanie"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr "(R) relatywne podążanie"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr "(M) lustrzane podążanie"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr "(P) niewolnicze podążanie"
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr "(?) nieznane podążanie"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) atak"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) domyślny atak"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) zdejmij tarczę do ataku"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S) załóż tarczę do ataku"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) idź, atakuj"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) idź, atakuj, podnieś"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) bez autoataku"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) podnoś w promieniu 1x1"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) podnoś w promieniu 2x1"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) podnoś w promieniu 2x3"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) podnoś w promieniu 3x3"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) podejdź i podnoś do 4 pól"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) podejdź i podnoś do 8 pól"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr "(A) podejdź i podnoś w zasięgu wzroku"
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?) podnoś"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) normalny widok mapy"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr "(D) widok debug"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr "(u) płaska mapa"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr "(U) płaska mapa 2"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) mapa bez tekstur"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b) dwukolorowa mapa"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) użyj #flar jako M.A."
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) użyj #chiza jako M.A."
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) użyj #ingrav jako M.A."
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) użyj #frillyar jako M.A."
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) użyj #upmarmu jako M.A."
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) magiczny atak"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr "(a) atakuj wszystkich graczy"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr "(f) atakuj niezaprzyjaźnionych"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr "(b) atakuj nielubianych"
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr "(d) nie atakuj graczy"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr "(?) atak PvP"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr "(D) domyślna imitacja"
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr "(O) Imituj strój"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr "(?) imitacja"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "AFK"
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) przy klawiaturze"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) AFK"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) stan"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr "(G) tryb kamery gry"
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr "(F) wolny tryb kamery"
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr "Modyfikatory gry włączone."
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr "Modyfikatory gry wyłączone."
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr "Modyfikatory gry nieznane"
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "Podążasz za: "
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr "Imitujesz: "
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr "Widzisz "
 
@@ -6014,15 +6004,15 @@ msgstr "Zasięg ataku"
 msgid "Damage per sec."
 msgstr "Obrażenia na sek."
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Network::connect() otrzymał pusty adres!"
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr "Nie można było odnaleźć serwera."
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr "Połączenie z serwerem przerwane."
 
diff --git a/po/pt.po b/po/pt.po
index 632af14aa..9b3cc0997 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/"
 "language/pt/)\n"
@@ -29,7 +29,7 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
@@ -46,56 +46,56 @@ msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -105,50 +105,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -333,35 +333,35 @@ 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\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -395,20 +395,20 @@ msgid "Name"
 msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Mover"
 
@@ -421,8 +421,8 @@ msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Comprar"
 
@@ -466,14 +466,13 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Vender"
 
@@ -481,18 +480,18 @@ msgstr "Vender"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -598,7 +597,7 @@ msgid "Race:"
 msgstr "Corrida:"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "Criar"
 
@@ -613,7 +612,7 @@ msgstr "Mulher"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Outro"
 
@@ -782,13 +781,9 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -953,7 +948,7 @@ msgstr "Você sabia?"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
@@ -999,13 +994,13 @@ msgstr "Descrição:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor coloque ao menos uma porta de servidor."
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -1033,7 +1028,7 @@ msgstr "por quantidade"
 msgid "by type"
 msgstr "por tipo"
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventário"
@@ -1047,31 +1042,31 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -1080,18 +1075,18 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Descartar"
 
@@ -1140,7 +1135,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Estatísticas"
 
@@ -1336,11 +1331,11 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1362,7 +1357,7 @@ msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -1375,362 +1370,330 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "Sussuro"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "Curar"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "Ser Amigo(a)"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr "Ser inimigo(a)"
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr "Lista Negra"
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr "Definir como inimigo(a)"
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "Apagar"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr "Não ignorar"
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "Ignorar completamente"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "Seguir"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "Imitar"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr "Convidar para grupo"
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "Chutar do grupo"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr "Desaparecer"
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "Mostar itens"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "Limpar conjunto de roupas"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "Comprar (?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "Vender (?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr "Remover da Lista de Ataques"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr "Adicionar a prioridade na lista de ataques"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "Chutar do grupo"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "A Remover"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr "Urdidura"
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr "Mover câmera"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr "Limpar equipamento"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "Carregar Antigos Feitiços"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr "Não remova o nome"
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "Remover nome"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr "Convidar para grupo"
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Carregar antigos atalhos de item"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "Mover a cima"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "Mover a baixo"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "Limpar conjunto de roupas"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "Ser Amigo(a)"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr "Ser inimigo(a)"
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr "Lista Negra"
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr "Definir como inimigo(a)"
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "Apagar"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr "Não ignorar"
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "Ignorar completamente"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "Seguir"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "Imitar"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "Comprar (?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "Vender (?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "Mostar itens"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Trocar servidor"
@@ -2353,11 +2316,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2782,158 +2745,170 @@ msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr "Mensagem em modo Ausente"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "Mostrar job"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr "A habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:143
 msgid "Enable advert protocol"
 msgstr "Habilitar protocolo de aviso"
 
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr "Suporte de bots"
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr "Habilitar suporte ao AuctionBot "
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr "Sempre mostrar"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr "Auto ocultar em baixa resolução"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr "Sempre alto ocultar"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr "Botões de atalho"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr "Servidor Proxy"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr "Proxy de sistema"
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr "Conexão Direta"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr "SOCK5 hostname"
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção contra bugs no servidor (não desabilitar)"
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
@@ -3461,7 +3436,7 @@ msgstr "Proposta de negociação"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -3540,175 +3515,190 @@ msgstr "Sair da guilda?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr "Atq"
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr "Mobs Prioritarios"
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "Atacar Mobs"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, 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:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, 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:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 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:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "Especiais"
 
@@ -4266,79 +4256,79 @@ 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."
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr "AB"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "Analisador de bot"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "Quem esta online"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr "EST"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "Smileys"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr "HAB"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr "AT"
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr "FE"
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr "DE"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "VS"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "Você sabia"
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "CON"
 
@@ -4354,7 +4344,7 @@ msgstr "Trocar Login"
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
@@ -4376,7 +4366,7 @@ msgid "JB%d"
 msgstr "JB%d"
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr "Tecla u"
 
@@ -4388,342 +4378,342 @@ msgstr "Armazém"
 msgid "Cart"
 msgstr "Carrinho"
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto(a) por %s"
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr "exp"
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr "Profissão"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr "(?) Movimento desconhecido"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimento louco numero %d"
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr "(a) Alcance de arqueiros"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr "(a) atacar todos inimigos"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr "(f) ataque todos, exceto amigos"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr "(d) não atacar jogadores"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr "(?) Ataque PVP"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr "Modificador de jogo desconhecido"
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr "Você vê "
 
@@ -6007,15 +5997,15 @@ msgstr "Atraso de alcance"
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Endereço vazio enviado para Network::connect()!"
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr "Não foi possível determinar o host \""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f2e168075..cf144fe13 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
 "manaplus/language/pt_BR/)\n"
@@ -31,7 +31,7 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
@@ -48,56 +48,56 @@ msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Saindo"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Habilitar rolagem suave"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Rolagem suave"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -107,50 +107,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -335,35 +335,35 @@ 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\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -397,20 +397,20 @@ msgid "Name"
 msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Falar"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Mover"
 
@@ -423,8 +423,8 @@ msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Comprar"
 
@@ -468,14 +468,13 @@ msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Vender"
 
@@ -483,18 +482,18 @@ msgstr "Vender"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -600,7 +599,7 @@ msgid "Race:"
 msgstr "Corrida:"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "Criar"
 
@@ -615,7 +614,7 @@ msgstr "Mulher"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Outro"
 
@@ -784,13 +783,9 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -955,7 +950,7 @@ msgstr "Você Sabia?"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
@@ -1001,13 +996,13 @@ msgstr "Descrição:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor, pelo menos um dos dois tipos de portas de servidor."
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -1035,7 +1030,7 @@ msgstr "por quantidade"
 msgid "by type"
 msgstr "por tipo"
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventário"
@@ -1049,31 +1044,31 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -1082,18 +1077,18 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Descartar"
 
@@ -1142,7 +1137,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Estatísticas"
 
@@ -1338,11 +1333,11 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1364,7 +1359,7 @@ msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -1377,362 +1372,330 @@ msgstr "Desequipar antes"
 msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "Sussurro"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "Cura"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "Ser amigo(a)"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr "Ser inimigo(a)"
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr "Lista Negra"
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr "Definir como inimigo"
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "Apagar"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr "Não ignorar"
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "Ignorar completamente"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "Seguir"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "Imitar"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr "Convidar para grupo"
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "Expulsar do grupo"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr "Desaparecer"
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "Mostrar itens"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "Despir"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "Add comentário"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "Comprar (?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "vender (?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr "Remover da lista de ataque"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr "Adicionar na prioridade da lista de ataques"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "Expulsar do grupo"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "Remover"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr "Urdidura"
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr "Mover câmera "
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr "Limpar conjunto de roupas"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "Carregar velhos feitiços"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr "Não retire o nome"
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "Remover o nome"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr "Convidar para grupo"
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Carregar antigos atalhos de item"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "Mover para baixo"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "Despir"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "Ser amigo(a)"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr "Ser inimigo(a)"
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr "Lista Negra"
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr "Definir como inimigo"
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "Apagar"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr "Não ignorar"
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "Ignorar completamente"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "Seguir"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "Imitar"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "Comprar (?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "vender (?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "Mostrar itens"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Trocar servidor"
@@ -2355,11 +2318,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2784,158 +2747,170 @@ msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr "Mensagem em modo Ausente"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "Mostrar job"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:143
 msgid "Enable advert protocol"
 msgstr "Habilitar o protocolo de aviso"
 
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr "Suporte de bots"
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr "Habilitar suporte ao AuctionBot "
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr "Sempre mostrar"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr "Auto ocultar em baixa resolução"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr "Sempre ocultar"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr "botões de atalho"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr "Servidor proxy"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr "Sistema proxy"
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr "Conexão direta"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr "SOCK5 hostname"
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr "Tipo de Proxy"
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr "Proxy endereço:porta"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção para servidores com bugs (não desabilitar)"
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
@@ -3464,7 +3439,7 @@ msgstr "Proposta de negociação"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -3543,175 +3518,190 @@ msgstr "Sair da guilda?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr "Ataque"
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr "Mobs prioritarios "
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "Atacar mobs"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, 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:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, 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:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 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:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "Especiais"
 
@@ -4269,79 +4259,79 @@ 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."
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr "AB"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "Analisador de bot"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "Quem esta online"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr "EST"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "Smileys:"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr "HAB"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr "AT"
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr "FE"
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr "DE"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "Você Sabia"
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "CON"
 
@@ -4357,7 +4347,7 @@ msgstr "Trocar Login"
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
@@ -4379,7 +4369,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr "tecla u"
 
@@ -4391,342 +4381,342 @@ msgstr "Armazém"
 msgid "Cart"
 msgstr "Carrinho"
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto(a) por %s"
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr "exp"
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr "profissão"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr "(?) movimento desconhecido"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimento louco número %d"
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr "(a) Alcance ataque de arqueiro"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr "(a) atacar qualquer jogador"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr "(f) ataque todos, exceto amigos"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr "(d) não atacar jogadores"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr "(?) ataque em pvp"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) Modo Ausente"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr "Modificadores são desconhecidos"
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr "Você vê "
 
@@ -6009,15 +5999,15 @@ msgstr "Atraso de alcance"
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Endereço vazio enviado para Network::connect()!"
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr "Não foi possível determinar o host \""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
diff --git a/po/ru.po b/po/ru.po
index 14d5af825..a6296900e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:49+0000\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:47+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/"
 "language/ru/)\n"
@@ -31,7 +31,7 @@ msgstr "Игнорировать предложения о торговле"
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
@@ -48,56 +48,56 @@ msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Производительность"
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Видео"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr "Темы"
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -107,50 +107,50 @@ msgstr "Смена игрового сервера"
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -341,35 +341,35 @@ msgstr ""
 "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
 "\"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -403,20 +403,20 @@ msgid "Name"
 msgstr "Имя"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Атака"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Разговор"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "Движение"
 
@@ -429,8 +429,8 @@ msgid "Reset"
 msgstr "Сбросить"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Купить"
 
@@ -474,14 +474,13 @@ msgid "Max"
 msgstr "Макс"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Магазин"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Продать"
 
@@ -489,18 +488,18 @@ msgstr "Продать"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -606,7 +605,7 @@ msgid "Race:"
 msgstr "Раса:"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "Создать"
 
@@ -621,7 +620,7 @@ msgstr "Женщина"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "Другое"
 
@@ -790,13 +789,9 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "Игнорировать"
 
@@ -961,7 +956,7 @@ msgstr "Вы знаете?"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрыть"
 
@@ -1007,13 +1002,13 @@ msgstr "Описание:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Пожалуйста введите хотябы адрес и порт сервера"
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Снаряжение"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Снять"
 
@@ -1041,7 +1036,7 @@ msgstr "по кол-ву."
 msgid "by type"
 msgstr "по типу"
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Инвентарь"
@@ -1055,31 +1050,31 @@ msgid "Filter:"
 msgstr "Фильтр:"
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Надеть"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Использовать"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Разделить"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "Наряды"
 
@@ -1088,18 +1083,18 @@ msgid "Weight:"
 msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Бросить"
 
@@ -1148,7 +1143,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Вес: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "Окно статистики атак"
 
@@ -1346,11 +1341,11 @@ msgid "Submit"
 msgstr "Применить"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "Очистить"
 
@@ -1372,7 +1367,7 @@ msgid "Outfit: %d"
 msgstr "Наряд: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "Клавиша: %s"
@@ -1385,362 +1380,330 @@ msgstr "Сначала снять"
 msgid "Away outfit"
 msgstr "наряд отсутствия"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Торговать"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "Приват"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "Лечить"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "Подружиться"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr "Пренебречь"
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr "Черный список"
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr "Сделать врагом"
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr "Стереть"
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr "Не игнорировать"
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "@@ignore|Полностью игнорировать@@"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "Следовать"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr "Имитировать"
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr "Пригласить в группу"
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "Выкинуть из группы"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "Кикнуть игрока"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr "Уничтожить"
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "Показать предметы"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr "Раздеть"
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "Добавить коментарий"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "Купить (?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "Продать (?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr "Кикнуть"
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Игроки"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "Выкинуть из группы"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Поднять"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "Элмент карты"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr "Удалить"
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr "Прыгнуть"
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr "Передвинуть камеру"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr "Очистить наряд"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "Заклинания"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr "Загрузить старые заклинания"
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr "Не скрывать имя"
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "Скрывать имя"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "Рарешить режим отошел"
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr "Запретить режим отошел"
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "Покинуть"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr "Пригласить в группу"
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "Имя:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "Комментарий             "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "Комментарий:                      "
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "Сохранить 10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Сохранить половину"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "Сохранить все"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "Бросить все"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "Получить половину"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "Получить все"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr "Загрузить старые горячие клавиши предметов"
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "Спрятать"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "Показать"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(по умолчанию)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "Передвинуть выше"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr "Раздеть"
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "Подружиться"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr "Пренебречь"
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr "Черный список"
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr "Сделать врагом"
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr "Стереть"
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr "Не игнорировать"
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "@@ignore|Полностью игнорировать@@"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "Следовать"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr "Имитировать"
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "Купить (?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "Продать (?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "Показать предметы"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr "Удалить из поднятия"
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr "Сделать поднимаемым"
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Сменить сервер"
@@ -2363,11 +2326,11 @@ msgstr "Модификатор"
 msgid "Basic"
 msgstr "Основное"
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr "Горячие клавиши"
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr "Окна"
 
@@ -2792,158 +2755,170 @@ msgid "Attack while moving"
 msgstr "Атаковать в движении"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr "Атаковать следующую цель"
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "Синх. движение"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "Программа для сумасшедших движений A"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "Игрок"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "Показывать свою жизнь"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "Включить быструю смену статов"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr "Прокручивать прицел по игрокам"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "Показывать опыт работы."
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "Показ. всплыв. сообщения игроков"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr "Ответ в режиме \"отошел\""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "Показывать уровень работы"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr "Включить фильтр атак"
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
+msgstr "Включить фильтр поднятия"
+
+#: src/gui/setup_other.cpp:143
 msgid "Enable advert protocol"
 msgstr "Включить режим посылки состояния"
 
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "Принимать запросы купить/продать"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "Сохранять текст NPC"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr "Поддержка ботов"
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr "Включить поддержку бота аукционов"
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Включить поддержку гильд-бота"
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr "Клавиатура"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr "Задержка перед повтором"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr "Интервал повторения"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr "Всегда показывать"
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr "Скрывать с небольшим разрешением"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr "Всегда скрывать"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr "Кнопки"
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr "Прокси сервер"
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr "Системный прокси"
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr "Прямое соединение"
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr "SOCKS5 хост"
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr "Тип прокси"
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr "Прокси адрес:порт"
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr "Включить серверную атаку"
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Включить защиту от бажных серверов (не выключать!)"
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "Режим кеширования игроков"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr "Спрятать картинку счита"
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Использовать FBO для скриншотов (только в режиме opengl)"
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr "Задержка между сетевыми соединениями"
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "Показать фон"
 
@@ -3479,7 +3454,7 @@ msgstr "Запрос на Торговлю"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s хочет %s %s, вы принимаете предложение?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Умения"
 
@@ -3558,175 +3533,190 @@ msgstr "Покинуть Гильдию?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы действительно хотите выйти из гильдии %s?"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Группа"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Пригласить пользователя %s в группу."
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Запрошен выход из группы %s."
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr "Пригласить пользователя в группу"
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Кого вы хотите пригласить в группу %s?"
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "Покинуть группу?"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Вы действительно хотите покинуть группу %s?"
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr "Нав"
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr "Атк"
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr "Приоритетные монстры"
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "Атакуемые монстры"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr "Игнорируемые монстры"
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr "Подб"
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr "Подбирать предметы"
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr "Игнорировать предметы"
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "Создать Гильдию"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "Создать группу"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Общество"
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "Пригласить"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr "И"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr "Д"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принято приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "Имя гильдии"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "Выберите имя для гильдии."
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в гильдию, но оно не первое."
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к гильдии %s."
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в гильдию"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но оно не порвое."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "Вас приглашают в группу."
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас приглашают присоединиться к группе %s."
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает Вас к себе в группу."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 msgid "Cannot create party. You are already in a party"
 msgstr "Не удалось создать группу. Вы уже состоите в другой."
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr "Имя группы"
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "Особые"
 
@@ -4286,79 +4276,79 @@ msgstr "Команда: /unignore <игрок>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr "ДБ"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "Окно детектора ботов"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr "КО"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "Кто онлайн"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr "СА"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "Смайлы"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr "СО"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Состояние"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr "СН"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr "ИНВ"
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr "УМ"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr "СПЕ"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr "ОБЩ"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr "ГК"
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr "ЗАК"
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr "БР"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "ВЗ"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "Вы знаете?"
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "ОПЦ"
 
@@ -4374,7 +4364,7 @@ msgstr "Сменить логин"
 msgid "Choose World"
 msgstr "Выберите сервер"
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr "кнопка_%d"
@@ -4396,7 +4386,7 @@ msgid "JB%d"
 msgstr "ДЖ%d"
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr "неиз."
 
@@ -4408,42 +4398,42 @@ msgstr "Хранилище"
 msgid "Cart"
 msgstr "Телега"
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr "Вас убил %s"
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4451,300 +4441,300 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr "опыт"
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr "работа"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr "(D) движения по умолчанию"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда с сумашедшими движениями"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение с сумашедшими движениями"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и сумашедшие движения"
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr "(?) неизвестное движение"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) сумасшедшее движение %d"
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr "(a) пользовательские сумашедшие движения"
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr "(?) неизвестные сумасшедшие движения"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на расстояние 1"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на расстояние 2"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на расстояние 3"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на расстояние 5"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на расстояние 7"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на расстояние атаки"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr "(a) атака лучника"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?) неизвестное движение к цели"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr "(D) следование по умолчанию"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr "(R) относительное следование"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное следование"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr "(P) следование как животное"
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr "(?) неизвестное следование"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) неизвестная атака"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr "(D) обычная атака"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки со щитом"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, собирать"
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) поднятие в области 1x1"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) поднятие из области 2x1"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) поднятие из области спереди 2x3"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) поднятие из области 3x3"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и поднятие на расстоянии 4"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и поднятие на расстоянии 8"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и поднятие на максимальном расстоянии"
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?) неизвестный режим поднятия"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr "(u) специальный режим карты"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr "(U) специальный режим карты 2"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr "(e) режим пустой карты"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr "(f) использовать #flar для атаки"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) использовать #chiza для атаки"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) использовать #ingrav для атаки"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) использовать #frillyar для атаки"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) использовать #upmarmu для атаки"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr "(?) неизвестная магическая атака"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr "(a) атаковать всех игроков"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr "(f) атаковать всех кроме друзей"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr "(b) атаковать врагов"
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr "(d) не атаковать игроков"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr "(?) pvp атака"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr "(D) имитация по умолчанию"
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr "(O) имитация нарядов"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr "(?) неизвестная имитация"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr "(A) отошел"
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr "(?) неизвестный режим отошел"
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr "(G) игровая камера"
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr "Игровые модификаторы в неизвестном положении"
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr "Вы видите "
 
@@ -6024,15 +6014,15 @@ msgstr "Зона атаки"
 msgid "Damage per sec."
 msgstr "Урон в сек."
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "Пустой адрес был передан методу Network::connect()!"
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr "Не удалось найти хост \""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr "Подключение к серверу прервано."
 
diff --git a/po/sk.po b/po/sk.po
index e9f4e3b27..2b9c7621f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Nastavenie"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -332,35 +332,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -394,20 +394,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -420,8 +420,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Kúpiť"
 
@@ -465,14 +465,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Obchod"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Predaj"
 
@@ -480,18 +479,18 @@ msgstr "Predaj"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -597,7 +596,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "Vytvoriť"
 
@@ -612,7 +611,7 @@ msgstr "Žena"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -768,7 +767,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
@@ -781,13 +780,9 @@ msgstr "Áno"
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -952,7 +947,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvoriť"
 
@@ -998,13 +993,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Vybavenie"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Odstrojiť"
 
@@ -1032,7 +1027,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventár"
@@ -1046,31 +1041,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Vystrojiť"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Použiť"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1079,18 +1074,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Zahodiť"
 
@@ -1139,7 +1134,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1337,11 +1332,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1363,7 +1358,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1376,362 +1371,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Zmeniť server"
@@ -2354,11 +2317,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2781,158 +2744,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3456,7 +3431,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Schopnosti"
 
@@ -3535,175 +3510,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4260,79 +4247,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Stav"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4348,7 +4335,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4370,7 +4357,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4382,42 +4369,42 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4425,300 +4412,300 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5393,36 +5380,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5976,15 +5963,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/sq.po b/po/sq.po
index d4f0e6a44..067b1c251 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -475,18 +474,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr ""
 
@@ -607,7 +606,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -776,13 +775,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 8a73f4db3..d1daf1266 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Ignorerar handelserbjudanden"
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Inställningar"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "Fel"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 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:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Allmänt"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Kunde inte spara skärmbild!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Nätverksfel"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunde inte ladda %s"
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr "Namn"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Attackera"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Prata"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr "Återställ"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Köp"
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Affär"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Sälj"
 
@@ -475,18 +474,18 @@ msgstr "Sälj"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "Skapa"
 
@@ -607,7 +606,7 @@ msgstr "Kvinna"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr "Chatt"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -776,13 +775,9 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Utrustning"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "Avrusta"
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Inventarium"
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Utrusta"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Använd"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Dela"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr "Vikt:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Lagra"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Hämta"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "Släpp"
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr "Vidare"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Byteshandla"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Spelare"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Byt server"
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr "Förfrågan om byteshandel"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Färdigheter"
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupp"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr "Skapa gille"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig till sin grupp."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, 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:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index e38364913..aeb693d57 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -42,56 +42,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -101,50 +101,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -326,35 +326,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -388,20 +388,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -414,8 +414,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -459,14 +459,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -474,18 +473,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -591,7 +590,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr ""
 
@@ -606,7 +605,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -762,7 +761,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -775,13 +774,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -946,7 +941,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -992,13 +987,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1026,7 +1021,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1040,31 +1035,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1073,18 +1068,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1133,7 +1128,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1329,11 +1324,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1355,7 +1350,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1368,362 +1363,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2346,11 +2309,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2773,158 +2736,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3448,7 +3423,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3527,175 +3502,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4252,79 +4239,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4340,7 +4327,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4362,7 +4349,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4374,342 +4361,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5384,36 +5371,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5967,15 +5954,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index 626acb0a7..20ab9dbc2 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -327,35 +327,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "సాధారణ"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -389,20 +389,20 @@ msgid "Name"
 msgstr "పేరు"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -460,14 +460,13 @@ msgid "Max"
 msgstr "గరిష్ఠ"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -475,18 +474,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -592,7 +591,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "సృష్టించు"
 
@@ -607,7 +606,7 @@ msgstr "స్త్రీ"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -763,7 +762,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -776,13 +775,9 @@ msgstr "అవును"
 msgid "No"
 msgstr "కాదు"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -947,7 +942,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -993,13 +988,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1027,7 +1022,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1041,31 +1036,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1074,18 +1069,18 @@ msgid "Weight:"
 msgstr "బరువు:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1134,7 +1129,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1330,11 +1325,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1356,7 +1351,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1369,362 +1364,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "ఆటగాళ్ళు"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2347,11 +2310,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2774,158 +2737,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3449,7 +3424,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3528,175 +3503,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4253,79 +4240,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4341,7 +4328,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4363,7 +4350,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4375,342 +4362,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5385,36 +5372,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5968,15 +5955,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index f5161f64e..d72416b63 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "ตั้งค่า"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -322,35 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,20 +384,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -410,8 +410,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "ซื้อ"
 
@@ -455,14 +455,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -470,18 +469,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -587,7 +586,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "สร้าง"
 
@@ -602,7 +601,7 @@ msgstr "หญิง"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -758,7 +757,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -771,13 +770,9 @@ msgstr "ใช่"
 msgid "No"
 msgstr "ไม่"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -942,7 +937,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -988,13 +983,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1022,7 +1017,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1036,31 +1031,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "ใช้"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1069,18 +1064,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "ทิ้ง"
 
@@ -1129,7 +1124,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1323,11 +1318,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1349,7 +1344,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1362,362 +1357,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2340,11 +2303,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2767,158 +2730,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3442,7 +3417,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3521,175 +3496,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4246,79 +4233,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "สถานะ"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4334,7 +4321,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4356,7 +4343,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4368,341 +4355,341 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5377,36 +5364,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5960,15 +5947,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index da5c260a8..6d504b6a1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Gelen takas istekleri görmezden geliniyor."
 msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "Kur"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "Hata"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -322,35 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "Genel"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "Ekrangörüntüsü kaydı başarısız."
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,20 +384,20 @@ msgid "Name"
 msgstr "İsim"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "Saldırı"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Konuş"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -410,8 +410,8 @@ msgid "Reset"
 msgstr "Sıfırla"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "Satın al"
 
@@ -455,14 +455,13 @@ msgid "Max"
 msgstr "En Fazla"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "Mağaza"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Satış"
 
@@ -470,18 +469,18 @@ msgstr "Satış"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -587,7 +586,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "Oluştur"
 
@@ -602,7 +601,7 @@ msgstr "Kadın"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -758,7 +757,7 @@ msgstr "Sohbet"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -771,13 +770,9 @@ msgstr "Evet"
 msgid "No"
 msgstr "Hayır"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -942,7 +937,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Kapat"
 
@@ -988,13 +983,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "Ekipman"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1022,7 +1017,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "Envanter"
@@ -1036,31 +1031,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "Donatmak"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Kullan"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "Bölme"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1069,18 +1064,18 @@ msgid "Weight:"
 msgstr "Ağırlık:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Depo"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "Almak"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1129,7 +1124,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1323,11 +1318,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1349,7 +1344,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1362,362 +1357,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Ticaret"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Oyuncular"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "Geçiş sunucusu"
@@ -2340,11 +2303,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2767,158 +2730,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3442,7 +3417,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "Beceriler"
 
@@ -3521,175 +3496,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Parti"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr "Birlik oluşturma"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4246,79 +4233,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "Durum"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4334,7 +4321,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4356,7 +4343,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4368,341 +4355,341 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5377,36 +5364,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5960,15 +5947,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/vls.po b/po/vls.po
index 0ca403585..6bffdebd0 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.net/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -42,56 +42,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -101,50 +101,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -326,35 +326,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -388,20 +388,20 @@ msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -414,8 +414,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr ""
 
@@ -459,14 +459,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
@@ -474,18 +473,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -591,7 +590,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr ""
 
@@ -606,7 +605,7 @@ msgstr ""
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -762,7 +761,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -775,13 +774,9 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -946,7 +941,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -992,13 +987,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr ""
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr ""
 
@@ -1026,7 +1021,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr ""
@@ -1040,31 +1035,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1073,18 +1068,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr ""
 
@@ -1133,7 +1128,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1329,11 +1324,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1355,7 +1350,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1368,362 +1363,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr ""
@@ -2346,11 +2309,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2773,158 +2736,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3448,7 +3423,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr ""
 
@@ -3527,175 +3502,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4252,79 +4239,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4340,7 +4327,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4362,7 +4349,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4374,342 +4361,342 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5384,36 +5371,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5967,15 +5954,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 75103c6b2..ed80bc5a8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-28 15:55+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-12 15:59+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -29,7 +29,7 @@ msgstr "忽略新进的交易请求"
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1225
 msgid "Visible on map"
 msgstr "在地图上可见"
 
@@ -46,56 +46,56 @@ msgid "miss"
 msgstr "无法出售无法出售的物品。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "魔法攻击"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr "魔法防御"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr "尝试捡起不存在的物品。"
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr "捡起物品发生不存在的物品。"
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -105,50 +105,50 @@ msgstr "更改游戏服务器"
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr "请求注册的详细信息"
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr "更改密码成功！"
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr "更改电子邮件"
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr "更改电子邮件成功！"
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr "再见，随时欢迎回来... ..."
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，并且无法创建！退出。"
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机: %s"
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在并且无法创建！退出。"
@@ -325,35 +325,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -387,20 +387,20 @@ msgid "Name"
 msgstr "姓名"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "攻击"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "说话"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr "移动"
 
@@ -413,8 +413,8 @@ msgid "Reset"
 msgstr "重置"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "购买"
 
@@ -458,14 +458,13 @@ msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "出售"
 
@@ -473,18 +472,18 @@ msgstr "出售"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -590,7 +589,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1202
 msgid "Create"
 msgstr "建立"
 
@@ -605,7 +604,7 @@ msgstr "美女"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "其他"
 
@@ -774,13 +773,9 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr "忽略"
 
@@ -945,7 +940,7 @@ msgstr "你知道吗？"
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
 
@@ -991,13 +986,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "装备"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -1025,7 +1020,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "物品栏"
@@ -1039,31 +1034,31 @@ msgid "Filter:"
 msgstr "过滤器："
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "装备"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "分离"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr "套装"
 
@@ -1072,18 +1067,18 @@ msgid "Weight:"
 msgstr "重量："
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "丢弃"
 
@@ -1132,7 +1127,7 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "重量：%s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr "杀敌统计"
 
@@ -1326,11 +1321,11 @@ msgid "Submit"
 msgstr "提交"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr "清除"
 
@@ -1352,7 +1347,7 @@ msgid "Outfit: %d"
 msgstr "套装： %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr "按键：%s"
@@ -1365,362 +1360,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr "密语"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr "愈合"
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr "是朋友"
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr "完全忽略"
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr "按照"
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr "踢从党"
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr "踢从公会"
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr "踢球员"
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr "显示项目"
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr "发表评论"
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr "购买(?)"
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr "出售(?)"
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr "踢从党"
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "拾取"
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr "加入聊天"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr "地图项"
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "重命名"
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr "法术"
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr "禁用"
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr "启用突出"
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr "移除姓名"
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr "启用远"
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
 msgid "Leave"
 msgstr "留下"
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr "重命名的地图标志"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr "名称："
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr "玩家评论"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr "评论："
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr "所有"
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr "显示"
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr "x"
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr "是朋友"
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr "完全忽略"
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr "按照"
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr "购买(?)"
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr "出售(?)"
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr "显示项目"
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "交换服务器"
@@ -2343,11 +2306,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2770,158 +2733,170 @@ msgid "Attack while moving"
 msgstr "攻击的同时移动"
 
 #: src/gui/setup_other.cpp:104
+msgid "Attack next target"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
 msgid "Sync player move"
 msgstr "同步播放移动"
 
-#: src/gui/setup_other.cpp:107
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr "疯狂的举动的程序"
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr "显示自己的HP栏"
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr "启用快速统计"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr "显示工作EXP消息"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr "显示球员弹出窗口"
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr "显示工作"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr "启用攻击过滤器"
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr "接受出售/购买请求"
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr "启用商店模式"
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr "挂机支持"
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr "启用拍卖挂机支持"
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr "显示背景"
 
@@ -3445,7 +3420,7 @@ msgstr "请求交易"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗？"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "技能"
 
@@ -3524,175 +3499,190 @@ msgstr "离开公会？"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你确定要离开工会%s吗？"
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "t"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr "邀请用户%s加入团队."
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr "离开团队?"
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#. TRANSLATORS: Navigation tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:600
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#. TRANSLATORS: Attack filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:933
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:957
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:958
 msgid "Attack mobs"
 msgstr "攻击暴徒"
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:959
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#. TRANSLATORS: Pickup filter tab name in social window. Should be small
+#: src/gui/socialwindow.cpp:988
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1012
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1013
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1137
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
 msgid "Create Party"
 msgstr "建立"
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1203
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1219
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1223
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1368
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1378
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1395
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1408
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s"
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1478
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的"
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1492
 msgid "Guild Name"
 msgstr "公会名称"
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1493
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1507
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1513
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s"
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1519
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1534
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1545
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党。"
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1549
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队。"
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1562
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1571
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1586
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1591
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1592
 msgid "Choose your party's name."
 msgstr "选择n的名称。"
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr "特价商品"
 
@@ -4247,79 +4237,79 @@ msgstr "命令: /unignore <玩家>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "此命令将停止忽视了其他的球员，如果他们被忽略了。"
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr "挂机检查"
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr "谁在线"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr "表情符号"
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "状态"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr "你知道吗"
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr "SET"
 
@@ -4335,7 +4325,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4357,7 +4347,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4369,341 +4359,341 @@ msgstr "仓库"
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr "你看"
 
@@ -5968,15 +5958,15 @@ msgstr "攻击范围"
 msgid "Damage per sec."
 msgstr "每秒伤害"
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "空的地址给网络：连接（）！"
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr "无法解析主机“"
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr "连接到服务器终止。"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index a5ef19049..79a6dd415 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "顯示"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -322,35 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,20 +384,20 @@ msgid "Name"
 msgstr "名字"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -410,8 +410,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "購買"
 
@@ -455,14 +455,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "出售"
 
@@ -470,18 +469,18 @@ msgstr "出售"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -587,7 +586,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "創造"
 
@@ -602,7 +601,7 @@ msgstr "女生"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -758,7 +757,7 @@ msgstr ""
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -771,13 +770,9 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -942,7 +937,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
@@ -988,13 +983,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "裝備"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "卸下裝備"
 
@@ -1022,7 +1017,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "物品攔"
@@ -1036,31 +1031,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "裝備"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "分開"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1069,18 +1064,18 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "丟棄"
 
@@ -1129,7 +1124,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1323,11 +1318,11 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1349,7 +1344,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1362,362 +1357,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "交換伺服器"
@@ -2340,11 +2303,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2767,158 +2730,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3442,7 +3417,7 @@ msgstr ""
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "技能"
 
@@ -3521,175 +3496,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4246,79 +4233,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "狀態"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4334,7 +4321,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4356,7 +4343,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4368,341 +4355,341 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5377,36 +5364,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5960,15 +5947,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1b1bd4642..658200d66 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-04-27 21:45+0300\n"
-"PO-Revision-Date: 2012-04-27 18:47+0000\n"
+"POT-Creation-Date: 2012-05-11 23:28+0300\n"
+"PO-Revision-Date: 2012-05-11 20:38+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "忽略收到的交易要求"
 msgid "Accepting incoming trade requests"
 msgstr "接受收到的交易要求"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1227
 msgid "Visible on map"
 msgstr ""
 
@@ -43,56 +43,56 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1593 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1598 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:1012 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:105
+#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:1019 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:1024 src/gui/setup_video.cpp:237
+#: src/client.cpp:961 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "顯示"
 
-#: src/client.cpp:1029
+#: src/client.cpp:966
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1115
+#: src/client.cpp:1052
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1153
+#: src/client.cpp:1090
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1187
+#: src/client.cpp:1124
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1291
+#: src/client.cpp:1230
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1265
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1336
+#: src/client.cpp:1275
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1379 src/client.cpp:1387 src/client.cpp:1522
+#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
 #: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
@@ -102,50 +102,50 @@ msgstr ""
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:1397
+#: src/client.cpp:1336
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1423
+#: src/client.cpp:1362
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1424
+#: src/client.cpp:1363
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1443
+#: src/client.cpp:1382
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1444
+#: src/client.cpp:1383
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1464
+#: src/client.cpp:1403
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1465
+#: src/client.cpp:1404
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1688 src/client.cpp:1721 src/client.cpp:1736
-#: src/client.cpp:2172 src/client.cpp:2179
+#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
+#: src/client.cpp:2111 src/client.cpp:2118
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1879
+#: src/client.cpp:1818
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1913 src/client.cpp:1919
+#: src/client.cpp:1852 src/client.cpp:1858
 msgid "Error creating updates directory!"
 msgstr "建立更新目錄失敗！"
 
-#: src/client.cpp:1940
+#: src/client.cpp:1879
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -322,35 +322,35 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s 的選項可以是 \"yes\"、\"no\"、\"true\"、\"false\"、\"1\"、\"0\"。"
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:432
+#: src/game.cpp:253 src/gui/widgets/chattab.cpp:432
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
+#: src/game.cpp:257 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:434
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:517
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
-#: src/game.cpp:558
+#: src/game.cpp:567
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:568
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: src/game.cpp:943
+#: src/game.cpp:953
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:944
+#: src/game.cpp:954
 #, c-format
 msgid "Error while loading %s"
 msgstr "載入 %s 時發生錯誤"
@@ -384,20 +384,20 @@ msgid "Name"
 msgstr "名字"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
 #: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
 msgid "Attack"
 msgstr "攻擊"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:298
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:208
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "說話"
 
-#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:270
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:483
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:759
-#: src/gui/popupmenu.cpp:846 src/gui/setupactiondata.h:1542
+#: src/gui/botcheckerwindow.cpp:300 src/gui/popupmenu.cpp:199
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:620 src/gui/setupactiondata.h:1542
 msgid "Move"
 msgstr ""
 
@@ -410,8 +410,8 @@ msgid "Reset"
 msgstr "重設"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
-#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:771
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
+#: src/gui/popupmenu.cpp:2097
 msgid "Buy"
 msgstr "購買"
 
@@ -455,14 +455,13 @@ msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:141
+#: src/gui/inventorywindow.cpp:177 src/gui/setup_other.cpp:147
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:283
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:772
-#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:93
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
+#: src/gui/popupmenu.cpp:2098 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "出售"
 
@@ -470,18 +469,18 @@ msgstr "出售"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:350 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:524 src/gui/popupmenu.cpp:552
-#: src/gui/popupmenu.cpp:578 src/gui/popupmenu.cpp:597
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:634
-#: src/gui/popupmenu.cpp:862 src/gui/popupmenu.cpp:887
-#: src/gui/popupmenu.cpp:1889 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1977 src/gui/popupmenu.cpp:2023
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2101
-#: src/gui/popupmenu.cpp:2155 src/gui/popupmenu.cpp:2177
-#: src/gui/quitdialog.cpp:57 src/gui/register.cpp:83
-#: src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1209 src/gui/textcommandeditor.cpp:241
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
+#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:1682 src/gui/popupmenu.cpp:1709
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
+#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
+#: src/gui/socialwindow.cpp:1138 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:171
 msgid "Cancel"
@@ -587,7 +586,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1271
+#: src/gui/socialwindow.cpp:1200
 msgid "Create"
 msgstr "創造"
 
@@ -602,7 +601,7 @@ msgstr "女生"
 #: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:203 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr ""
 
@@ -758,7 +757,7 @@ msgstr "聊天"
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1089
+#: src/gui/chatwindow.cpp:1090
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -771,13 +770,9 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:722
-#: src/gui/popupmenu.cpp:736
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2030
+#: src/gui/popupmenu.cpp:2038 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:2066
 msgid "Ignore"
 msgstr ""
 
@@ -942,7 +937,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
@@ -988,13 +983,13 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:79
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:81
 msgid "Equipment"
 msgstr "裝備"
 
 #: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:162
-#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1851
-#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1994
+#: src/gui/inventorywindow.cpp:532 src/gui/popupmenu.cpp:1638
+#: src/gui/popupmenu.cpp:1738 src/gui/popupmenu.cpp:1794
 msgid "Unequip"
 msgstr "卸下裝備"
 
@@ -1022,7 +1017,7 @@ msgstr ""
 msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:81
+#: src/gui/inventorywindow.cpp:114 src/gui/windowmenu.cpp:83
 #: src/inventory.cpp:251
 msgid "Inventory"
 msgstr "物品攔"
@@ -1036,31 +1031,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:160 src/gui/inventorywindow.cpp:534
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1949
-#: src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:1640 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1796
 msgid "Equip"
 msgstr "裝備"
 
 #: src/gui/inventorywindow.cpp:161 src/gui/inventorywindow.cpp:538
-#: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:2000
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1744 src/gui/popupmenu.cpp:1800
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:634
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:2005
+#: src/gui/popupmenu.cpp:1649 src/gui/popupmenu.cpp:1749
+#: src/gui/popupmenu.cpp:1805
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1871
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
 msgid "Split"
 msgstr "分開"
 
 #: src/gui/inventorywindow.cpp:176 src/gui/outfitwindow.cpp:64
-#: src/gui/popupmenu.cpp:609 src/gui/setupactiondata.h:1546
+#: src/gui/popupmenu.cpp:460 src/gui/setupactiondata.h:1546
 msgid "Outfits"
 msgstr ""
 
@@ -1069,18 +1064,18 @@ msgid "Weight:"
 msgstr "重量:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:625
-#: src/gui/popupmenu.cpp:1837 src/gui/popupmenu.cpp:1970
-#: src/gui/popupmenu.cpp:2017 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "寄放"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1878
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1665
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1867
-#: src/gui/popupmenu.cpp:1963 src/gui/popupmenu.cpp:2010
-#: src/gui/windowmenu.cpp:102
+#: src/gui/inventorywindow.cpp:636 src/gui/popupmenu.cpp:1654
+#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1810
+#: src/gui/windowmenu.cpp:104
 msgid "Drop"
 msgstr "丟棄"
 
@@ -1129,7 +1124,7 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:74
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:76
 msgid "Kill stats"
 msgstr ""
 
@@ -1323,11 +1318,11 @@ msgid "Submit"
 msgstr "確認"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:156
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:653
+#: src/gui/npcdialog.cpp:115 src/gui/popupmenu.cpp:503
 msgid "Clear"
 msgstr ""
 
@@ -1349,7 +1344,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:315
+#: src/gui/windowmenu.cpp:319
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1362,362 +1357,330 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:542
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:310
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:547
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:703
-msgid "Be friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:458
-#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:712
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:735
-#: src/gui/popupmenu.cpp:748
-msgid "Disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:452
-#: src/gui/popupmenu.cpp:706 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:737
-msgid "Black list"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:715
-#: src/gui/popupmenu.cpp:723
-msgid "Set as enemy"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:418 src/gui/popupmenu.cpp:426
-#: src/gui/popupmenu.cpp:434 src/gui/popupmenu.cpp:440
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:716
-#: src/gui/popupmenu.cpp:724 src/gui/popupmenu.cpp:730
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:743
-msgid "Erase"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:189
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:728
-#: src/gui/popupmenu.cpp:734 src/gui/popupmenu.cpp:742
-#: src/gui/popupmenu.cpp:747
-msgid "Unignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:468
-msgid "Completely ignore"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
-msgid "Follow"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:468
-#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
-msgid "Imitation"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:790
-msgid "Invite to party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:479
-#: src/gui/popupmenu.cpp:795
-msgid "Kick from party"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:246
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:812
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:344 src/gui/popupmenu.cpp:587
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:817
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:180
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:592
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:259 src/gui/popupmenu.cpp:509
-#: src/gui/popupmenu.cpp:826
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:357
+#: src/gui/popupmenu.cpp:601
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:196
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:198
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:849
-msgid "Show Items"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:761
-#: src/gui/popupmenu.cpp:850 src/gui/popupmenu.cpp:2174
-msgid "Undress"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:273 src/gui/popupmenu.cpp:303
-#: src/gui/popupmenu.cpp:469 src/gui/popupmenu.cpp:762
-#: src/gui/popupmenu.cpp:851
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:2138
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:777 src/gui/popupmenu.cpp:856
-msgid "Buy (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:289 src/gui/popupmenu.cpp:518
-#: src/gui/popupmenu.cpp:778 src/gui/popupmenu.cpp:857
-msgid "Sell (?)"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:224
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:325
+#: src/gui/popupmenu.cpp:235
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:240
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:242
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:334
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2153
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347 src/gui/popupmenu.cpp:521
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:363
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:360 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:270 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/popupmenu.cpp:548
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:2128
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:549 src/gui/popupmenu.cpp:1887
-#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:441
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:569
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570 src/gui/popupmenu.cpp:2133
-#: src/gui/popupmenu.cpp:2144 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1981
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:444
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595
+#: src/gui/popupmenu.cpp:446
 msgid "Move camera"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:461
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:101
+#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:103
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:630
-msgid "Load old spells"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:631
+#: src/gui/popupmenu.cpp:481
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:507
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:509
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:511
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:513
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:515
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:517
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:672 src/gui/socialwindow.cpp:1273
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1202
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:525
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:870
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2126
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:636
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1377
+#: src/gui/popupmenu.cpp:1129
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1379
+#: src/gui/popupmenu.cpp:1131
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1421
+#: src/gui/popupmenu.cpp:1153
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1155
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1825
+#: src/gui/popupmenu.cpp:1612
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1616
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1830
+#: src/gui/popupmenu.cpp:1617
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1618
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1628
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1630
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1863 src/gui/popupmenu.cpp:1959
-#: src/gui/popupmenu.cpp:2006
+#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
+#: src/gui/popupmenu.cpp:1806
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882
+#: src/gui/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1670
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1884
+#: src/gui/popupmenu.cpp:1671
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1917 src/gui/popupmenu.cpp:1975
-msgid "Load old item shortcuts"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:2021
+#: src/gui/popupmenu.cpp:1827
 msgid "Clear drop window"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:1855 src/gui/popupmenu.cpp:1892
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2092
+#: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1898
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:1904
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2100 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1906 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2120 src/gui/setup_theme.cpp:62
-#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:992
-#: src/gui/socialwindow.cpp:1028 src/gui/socialwindow.cpp:1064
+#: src/gui/popupmenu.cpp:1926 src/gui/popupmenu.cpp:1977
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/socialwindow.cpp:885
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2130 src/gui/popupmenu.cpp:2141
+#: src/gui/popupmenu.cpp:1936 src/gui/popupmenu.cpp:1946
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2132 src/gui/popupmenu.cpp:2143
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1948
 msgid "Move down"
 msgstr ""
 
+#: src/gui/popupmenu.cpp:2002 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2028
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2029 src/gui/popupmenu.cpp:2037
+#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2031 src/gui/popupmenu.cpp:2039
+#: src/gui/popupmenu.cpp:2067
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
+#: src/gui/popupmenu.cpp:2048
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
+#: src/gui/popupmenu.cpp:2049 src/gui/popupmenu.cpp:2055
+#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2068
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2045 src/gui/popupmenu.cpp:2053
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2064
+#: src/gui/popupmenu.cpp:2072
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2074
+#: src/playerrelations.cpp:468
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2084
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2085
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2103 src/gui/popupmenu.cpp:2114
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2136
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2147
+msgid "Remove from pickup list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2151
+msgid "Add to pickup list"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:54
 msgid "Switch server"
 msgstr "交換伺服器"
@@ -2340,11 +2303,11 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:99
+#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:175
+#: src/gui/setupactiondata.h:1544 src/gui/setup_other.cpp:181
 msgid "Windows"
 msgstr ""
 
@@ -2767,158 +2730,170 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:104
-msgid "Sync player move"
+msgid "Attack next target"
 msgstr ""
 
 #: src/gui/setup_other.cpp:107
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:110
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:114
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:113
+#: src/gui/setup_other.cpp:116
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:116
+#: src/gui/setup_other.cpp:119
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:122
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:125
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:128
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:131
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:134
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:137
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
-msgid "Enable advert protocol"
+#: src/gui/setup_other.cpp:140
+msgid "Enable pickup filter"
 msgstr ""
 
 #: src/gui/setup_other.cpp:143
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:152
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:158
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:158
+#: src/gui/setup_other.cpp:164
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:167
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:172
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:174
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:177
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:184
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:179
+#: src/gui/setup_other.cpp:185
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:186
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:187
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:191
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:188
+#: src/gui/setup_other.cpp:194
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:195
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:201
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:202
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:205
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:211
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:208
+#: src/gui/setup_other.cpp:214
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:217
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:221
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:224
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:227
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:231
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:229
+#: src/gui/setup_other.cpp:235
+msgid "Network delay between sub servers"
+msgstr ""
+
+#: src/gui/setup_other.cpp:238
 msgid "Show background"
 msgstr ""
 
@@ -3442,7 +3417,7 @@ msgstr "要求交易"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:86
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:88
 msgid "Skills"
 msgstr "技能"
 
@@ -3521,175 +3496,187 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "隊伍"
 
-#: src/gui/socialwindow.cpp:375
+#: src/gui/socialwindow.cpp:326
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:340
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:416
+#: src/gui/socialwindow.cpp:367
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:417
+#: src/gui/socialwindow.cpp:368
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:426
+#: src/gui/socialwindow.cpp:377
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:427
+#: src/gui/socialwindow.cpp:378
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:654
+#: src/gui/socialwindow.cpp:599
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:935
+#: src/gui/socialwindow.cpp:932
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:975
+#: src/gui/socialwindow.cpp:956
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1010
+#: src/gui/socialwindow.cpp:957
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1046
+#: src/gui/socialwindow.cpp:958
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1206
+#: src/gui/socialwindow.cpp:986
+msgid "Pik"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1010
+msgid "Pickup items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1011
+msgid "Ignore items"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1135
 msgid "Create Guild"
 msgstr "建立公會"
 
-#: src/gui/socialwindow.cpp:1207 src/gui/socialwindow.cpp:1642
+#: src/gui/socialwindow.cpp:1136 src/gui/socialwindow.cpp:1583
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1249 src/gui/windowmenu.cpp:98
+#: src/gui/socialwindow.cpp:1178 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1272
+#: src/gui/socialwindow.cpp:1201
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1288
+#: src/gui/socialwindow.cpp:1217
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1292
+#: src/gui/socialwindow.cpp:1221
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1366
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1435
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1393
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1465
+#: src/gui/socialwindow.cpp:1406
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1512
+#: src/gui/socialwindow.cpp:1453
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1535
+#: src/gui/socialwindow.cpp:1476
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1490
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1550
+#: src/gui/socialwindow.cpp:1491
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1505
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1576
+#: src/gui/socialwindow.cpp:1517
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1532
 msgid "Received party request, but one already exists."
 msgstr "收到派對邀請,但而有另一個存在."
 
-#: src/gui/socialwindow.cpp:1602
+#: src/gui/socialwindow.cpp:1543
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1547
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1614
+#: src/gui/socialwindow.cpp:1555
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s 邀請你參加他們的派對."
 
-#: src/gui/socialwindow.cpp:1619
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s 邀請你參加 %s 派對."
 
-#: src/gui/socialwindow.cpp:1628
+#: src/gui/socialwindow.cpp:1569
 msgid "Accept Party Invite"
 msgstr "接受派對邀請"
 
-#: src/gui/socialwindow.cpp:1643
+#: src/gui/socialwindow.cpp:1584
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1648
+#: src/gui/socialwindow.cpp:1589
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1649
+#: src/gui/socialwindow.cpp:1590
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:93
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:95
 msgid "Specials"
 msgstr ""
 
@@ -4246,79 +4233,79 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "BC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:72
 msgid "Bot checker"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:74
 msgid "Who is online"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:78
+#: src/gui/windowmenu.cpp:80
 msgid "Status"
 msgstr "狀態"
 
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:81
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:86
+#: src/gui/windowmenu.cpp:88
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:101
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:103
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:104
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "YK"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:103
+#: src/gui/windowmenu.cpp:105
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:107
 msgid "SET"
 msgstr ""
 
@@ -4334,7 +4321,7 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:80
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
 #, c-format
 msgid "key_%d"
 msgstr ""
@@ -4356,7 +4343,7 @@ msgid "JB%d"
 msgstr ""
 
 #. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:92
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
 msgid "u key"
 msgstr ""
 
@@ -4368,341 +4355,341 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:378
+#: src/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1433
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1435
+#: src/localplayer.cpp:1436
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1442
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1445
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1448
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1475
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1676 src/localplayer.cpp:1710 src/localplayer.cpp:1711
+#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1716 src/localplayer.cpp:1723 src/localplayer.cpp:1730
+#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1906
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1907
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1908
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1909
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1910
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1911
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1933
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1935
+#: src/localplayer.cpp:1938
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1939
+#: src/localplayer.cpp:1942
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1956
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1957
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1958
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1959
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1960
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1961
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1962
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1963
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1964
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1983
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1984
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1985
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1986
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1987
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2007 src/localplayer.cpp:2030
+#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004 src/localplayer.cpp:2026
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2008
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2006
+#: src/localplayer.cpp:2009
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2030
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2031
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2029
+#: src/localplayer.cpp:2032
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2084
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2085
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2086
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2087
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2088
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2089
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2090
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2091
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2104
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2105
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2106
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2107
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2108
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2109
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2128
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2129
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2130
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2131
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2132
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2133
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2152
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2153
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2154
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2155
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2156
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2175
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2173
+#: src/localplayer.cpp:2176
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2177
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2205
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2222
+#: src/localplayer.cpp:2225
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2223
+#: src/localplayer.cpp:2226
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2224 src/localplayer.cpp:2239
+#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2237
+#: src/localplayer.cpp:2240
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2238
+#: src/localplayer.cpp:2241
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2263
+#: src/localplayer.cpp:2266
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2264
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2265
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3782
+#: src/localplayer.cpp:3785
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3784 src/localplayer.cpp:3799
+#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3793 src/localplayer.cpp:3801
+#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4150
+#: src/localplayer.cpp:4153
 msgid "You see "
 msgstr ""
 
@@ -5377,36 +5364,36 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:342 src/net/ea/playerhandler.cpp:352
-#: src/net/ea/playerhandler.cpp:434
+#: src/net/ea/playerhandler.cpp:338 src/net/ea/playerhandler.cpp:348
+#: src/net/ea/playerhandler.cpp:430
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:343
+#: src/net/ea/playerhandler.cpp:339
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:353
+#: src/net/ea/playerhandler.cpp:349
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:459
+#: src/net/ea/playerhandler.cpp:455
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:465
+#: src/net/ea/playerhandler.cpp:461
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:511
+#: src/net/ea/playerhandler.cpp:507
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:629
+#: src/net/ea/playerhandler.cpp:625
 msgid "Equip arrows first."
 msgstr ""
 
@@ -5960,15 +5947,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:153
+#: src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:361
+#: src/net/tmwa/network.cpp:365
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:431
+#: src/net/tmwa/network.cpp:435
 msgid "Connection to server terminated. "
 msgstr ""