Update and rebuild translations.

16 files changed, 1236 insertions, 1236 deletions

diff --git a/data/translations/help/es.po b/data/translations/help/es.po
index 548d2e785..37431eaf8 100644
--- a/data/translations/help/es.po
+++ b/data/translations/help/es.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-05-14 17:21+0000\n"
-"Last-Translator: Maria <mtorres2022@gmail.com>\n"
+"PO-Revision-Date: 2012-06-04 17:31+0000\n"
+"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\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"
@@ -300,7 +300,7 @@ msgid ""
 " 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 "El proyecto incluye el desarrollo de un cliente y un server. Otros estan creando mundos usando el Mana software. El proyecto ManaWorld es el iniciador del proyecto Mana. Mana fue dividido para facilitar el desarrollo de otros mundos."
+msgstr "El proyecto incluye el desarrollo de un cliente y un servidor. Otros están creando mundos usando el software de Mana. El proyecto The Mana World es el iniciador del proyecto Mana. Mana fue dividido para facilitar el desarrollo de otros mundos."
 
 msgid "/dumpg - dump graphics and some other settings to chat."
 msgstr "/dumpg - vaciar configuraciones gráficas y algunas otras al chat."
@@ -356,7 +356,7 @@ msgstr "ÍNDICE"
 msgid ""
 "You can disable yellow bar,\n"
 "by pressing key 8 on numeric keyboard."
-msgstr "Puedes desahibilitar la barra amarilla, presionando la tecla 8 del teclado numerico."
+msgstr "Puedes deshabilitar la barra amarilla, presionando la tecla 8 del teclado numérico."
 
 msgid "/ignoreall - add all whispers to ignore list."
 msgstr "/ignoreall - agregar todos los susurros a la lista de ignorados."
@@ -471,7 +471,7 @@ msgstr "COMUNICACIÓN:"
 msgid ""
 "##2ManaPlus##P is extended client based on code from ##2Mana##P client.\n"
 " Added many features, improved perfomance, stability, security and more."
-msgstr "##2ManaPlus##P es un cliente extendido basado en codigo del cliente ##2Mana##P . Con muchas caracteristicas agregadas, rendimiendo mejorado, estabilidad, seguridad y mas."
+msgstr "##2ManaPlus##P es un cliente extendido basado en código del cliente ##2Mana##P.\nCon muchas características agregadas, rendimiento mejorado, estabilidad, seguridad y más."
 
 msgid "##2SpaceBar##P                 \"Select OK\""
 msgstr "##2Barra Espaciadora##P                 \"Seleccionar OK\""
diff --git a/data/translations/help/fr.po b/data/translations/help/fr.po
index a9551ab6a..96a6a82e0 100644
--- a/data/translations/help/fr.po
+++ b/data/translations/help/fr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-05-28 13:37+0000\n"
-"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
+"PO-Revision-Date: 2012-06-05 12:05+0000\n"
+"Last-Translator: Bernard <nard@bh28.net>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgid "/serverunignoreall - unignore all whispers on server side."
 msgstr "/serverunignoreall - ne plus ignorer les chuchotements du côté serveur."
 
 msgid "To read about whispering and other chat commands, look here:"
-msgstr "Pour en savoir plus sur le chuchotement et les autres commandes dans le chat, regarde ici :"
+msgstr "Pour en savoir plus sur le chuchotement et les autres commandes dans le chat, regarder ici :"
 
 msgid "##2UP##P                       \"Move Up\""
 msgstr "##2HAUT##P                       \"Monter\""
@@ -43,7 +43,7 @@ msgid ""
 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 "##2KeyPad[3]##P                \"Audio On / Off\""
+msgstr "##2KeyPad[3]##P                \"Son On / Off\""
 
 msgid "##2F2##P                       \"Status Window\""
 msgstr "##2F2##P                       \"Fenêtre d'Etat\""
@@ -78,7 +78,7 @@ msgid "/neutral NICK - add nick to neutral relation list."
 msgstr "/neutral NICK - ajouter NICK à la liste des relations neutres."
 
 msgid "/addpriorityattack NAME - add monster to priority attack list."
-msgstr "/addpriorityattack NOM - ajouter le monstre NOM à la liste d'attaques prioritairest."
+msgstr "/addpriorityattack NOM - ajouter le monstre NOM à la liste d'attaques prioritaires."
 
 msgid "##2Enter##P                    \"Toggle Chat\""
 msgstr "##2Entrée##P                    \"Afficher/Cacher le chat\""
@@ -204,7 +204,7 @@ msgid "##2DOWN##P                     \"Move Down\""
 msgstr "##2BAS##P                     \"Descendre\""
 
 msgid "Visit IRC channel:"
-msgstr "Visite notre canal IRC :"
+msgstr "Visitez notre canal IRC :"
 
 msgid "##2LeftAlt + Equals(=)##P      \"Emote Shortcut 12\""
 msgstr "##2Alt-Gauche + Égal(=)##P              \"Raccourci Emoticône 12\""
@@ -285,7 +285,7 @@ msgstr "##20##P                        \"Raccourci Objet 10\""
 msgid ""
 "You can restore yellow bar settings,\n"
 "by right click on it and select in context menu \"Reset yellow bar\"."
-msgstr "Tu peux réinitialiser la barre jaune,\nen faisant un clic-droit dessus et en sélectionnant \"Remise aux valeurs par défaut de la barre jaune\"."
+msgstr "Vous pouvez réinitialiser la barre jaune,\nen faisant un clic-droit dessus et en sélectionnant \"Remise aux valeurs par défaut de la barre jaune\"."
 
 msgid "/who - print online players number to chat."
 msgstr "/who - affiche le nombre de joueurs en ligne dans le chat."
@@ -301,7 +301,7 @@ msgid ""
 " 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 "Ce projet comprend le développement d'un serveur et d'un client.\n D'autres équipes créés des mondes en utilisant les logiciels Mana. Le projet \"The Mana World\"\n est l'initiateur du projet \"Mana\". Mana à été divisé pour\n faciliter le développement de nouveaux mondes."
+msgstr "Ce projet comprend le développement d'un serveur et d'un client.\n D'autres équipes créent des mondes en utilisant les logiciels Mana. Le projet \"The Mana World\"\n est l'initiateur du projet \"Mana\". Mana à été divisé pour\n faciliter le développement de nouveaux mondes."
 
 msgid "/dumpg - dump graphics and some other settings to chat."
 msgstr "/dumpg - Ecrit les préférences graphiques et quelques autres dans la ligne de chat."
@@ -328,7 +328,7 @@ msgstr "##2Point-virgule(;)##P             \"Se tourner vers le bas\""
 
 msgid ""
 "You can hide/show bars and buttons by right click and select menu item."
-msgstr "Tu peux afficher/cacher une barre ou un bouton en faisant un clique-droit et en le sélectionnant dans la liste."
+msgstr "Vous pouvez afficher/cacher une barre ou un bouton en faisant un clique-droit et en le sélectionnant dans la liste."
 
 msgid "Windows"
 msgstr "Fenêtres"
@@ -453,7 +453,7 @@ msgid ""
 " 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 est 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."
+msgstr "##2ManaPlus##P est le résultat d'un effort important pour créer un client MMORPG innovant, libre et \n open source. Mana utilise des  graphiques 2D et a pour but de  créer un monde\n vaste, varié et interactif. It is licensié sous GPL, ce qui vous rend\n sur que ce jeu ne s'éloignera pas de vous."
 
 msgid ""
 "You can buy or sell items from players shops.\n"
@@ -727,7 +727,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 "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."
+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 pour vous éviter ces mésaventures."
 
 msgid ""
 " However, you can protect yourself from such players by ignoring them.  Right-\n"
diff --git a/po/cs.po b/po/cs.po
index 9dca9419b..e25deec1f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
 "PO-Revision-Date: 2012-05-31 22:03+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/language/"
@@ -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:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
@@ -46,12 +46,12 @@ msgid "miss"
 msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr ""
 
@@ -134,7 +134,7 @@ msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -457,7 +457,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -493,11 +493,11 @@ msgstr "Prodej"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -600,8 +600,8 @@ msgstr ""
 msgid "Race:"
 msgstr "Rasa:"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -675,23 +675,23 @@ msgstr "Zadej heslo pro smazání postavy"
 msgid "Enter password:"
 msgstr "Zadej heslo:"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "Vybrat"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr ""
 
@@ -970,7 +970,7 @@ msgstr "Automaticky otevírat toto okno"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -1130,11 +1130,11 @@ msgstr "Přidat k prodeji."
 msgid "Unknown."
 msgstr "Neznámý."
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "Váha: %s"
@@ -1366,7 +1366,7 @@ msgid "Outfit: %d"
 msgstr "Výstroj: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "Klávesa: %s"
@@ -1519,7 +1519,7 @@ msgstr "Zapnout \"away\""
 msgid "Disable away"
 msgstr "Vypnout \"away\""
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "Odejít"
 
@@ -1622,7 +1622,7 @@ msgstr "Zkopírovat do chatu"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr ""
 
@@ -1703,11 +1703,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Přepnout server"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Přepnout postavu"
 
@@ -3568,153 +3568,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr "Prioritní monstra"
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "Útočit na monstra"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr "Ignorovat monstra"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "Vytvořit gildu"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "Vytvořit partu"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Společenství"
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "Pozvat"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijato pozvání do party od %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnuto přijetí do party od %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijato pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnuto pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Vytvářím gildu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "Vytvářím partu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "Název gildy"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "Zvolte jméno vaší gildy."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 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:1513
+#: src/gui/socialwindow.cpp:1508
 #, 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:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "Přílmout pozvání do gildy"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 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:1545
+#: src/gui/socialwindow.cpp:1540
 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:1549
+#: src/gui/socialwindow.cpp:1544
 #, 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:1557
+#: src/gui/socialwindow.cpp:1552
 #, 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:1562
+#: src/gui/socialwindow.cpp:1557
 #, 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:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 msgid "Cannot create party. You are already in a party"
 msgstr "Nemohu vytvořit partu. Již jste členem party."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr "Jméno party"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
@@ -3810,51 +3810,51 @@ msgstr "Magie hvězd"
 msgid "Command Editor"
 msgstr "Editor příkazů"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "magie"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "ostatní"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "Příkaz:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "Mana:"
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "Typ cíle:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "Ikona:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "Mana:"
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "Úroveň magie:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "Škola magie:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "Úroveň školy:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "Uložit"
 
@@ -3904,33 +3904,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "Hrát"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces aktualizace není kompletní."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1  silně doporučujeme zkusit"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr "##1  aktualizaci později"
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "Hotovo"
 
@@ -4357,11 +4357,11 @@ msgstr ""
 msgid "Select World"
 msgstr "Zvol svět"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr "Změň přihlášení"
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr "vyber svět"
 
@@ -4962,16 +4962,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "připojených uživatel: %d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "Hra"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 7afdc6c51..9dcef34b0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
-"PO-Revision-Date: 2012-05-31 22:03+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
+"PO-Revision-Date: 2012-05-31 22:17+0000\n"
+"Last-Translator: Marco Jäger <linuxcobra@gmx.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/language/"
 "de/)\n"
 "Language: de\n"
@@ -36,7 +36,7 @@ msgstr "Ignoriere eingehende Handelsanfragen"
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/actorspritemanager.cpp:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "Sichtbar auf der Karte"
 
@@ -53,12 +53,12 @@ msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "I"
 
@@ -141,7 +141,7 @@ msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komm jeder Zeit wieder..."
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
@@ -461,7 +461,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -497,11 +497,11 @@ msgstr "Verkaufen"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -604,8 +604,8 @@ msgstr "^"
 msgid "Race:"
 msgstr "Rasse:"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "Erstellen"
 
@@ -679,23 +679,23 @@ msgstr "Gib dein Passwort ein, um den Charakter zu löschen"
 msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "Wähle"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "Level: %d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "(leer)"
 
@@ -974,7 +974,7 @@ msgstr "Öffne dieses Fenster automatisch"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -1134,11 +1134,11 @@ msgstr "Füge zu Verkaufsladen hinzu."
 msgid "Unknown."
 msgstr "Unbekannt."
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ","
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
@@ -1370,7 +1370,7 @@ msgid "Outfit: %d"
 msgstr "Ausrüstung: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "Taste: %s"
@@ -1523,7 +1523,7 @@ msgstr "Aktiviere abwesend"
 msgid "Disable away"
 msgstr "Deaktiviere abwesend"
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "Verlassen"
 
@@ -1626,7 +1626,7 @@ msgstr "Kopiere zu Chat"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(normal)"
 
@@ -1707,11 +1707,11 @@ msgstr "Von der Aufhebeliste entfernen"
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Server wechseln"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Spielfigur wechseln"
 
@@ -3580,154 +3580,154 @@ msgid "Are you sure you want to leave party %s?"
 msgstr "Bist du sicher, dass du die Gruppe %s verlassen willst?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr "Atk"
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr "Bevorzugte Monster"
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "Greife Monster an"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr "Ignoriere Monster"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr "Pik"
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr "Gegenstände aufheben"
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr "Gegenstände ignorieren"
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "Gruppe erstellen"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Sozial"
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr "F"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Gruppeneinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Gruppeneinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Gildeneinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Gildeneinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle die Gruppe \"%s\""
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "Gildenname"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Gruppe erhalten, es wurde schon einmal angefragt."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, 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:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 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:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr "Du wurdest zu einer Gruppe eingeladen."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du wurdest zu der Gruppe %s eingeladen."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1552
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Gruppe eingeladen."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1557
 #, 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:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "Nehme Gruppeneinladung an"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 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:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr "Gruppenname"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "Name deiner Gruppe wählen."
 
@@ -3823,51 +3823,51 @@ msgstr "Astralmagie"
 msgid "Command Editor"
 msgstr "Kommando Editor"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "magisch"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "andere"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "Symbol:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "Befehl:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "Mana:"
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "Art des Anvisierens:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "Icon:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "Mana:"
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "Magielevel:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "Magieschule:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "Schul-Level:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "Speichern"
 
@@ -3919,33 +3919,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "Aktualisiere..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "Los!"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr "##1 Du versuchst es später erneut."
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "Fertig"
 
@@ -4071,7 +4071,7 @@ msgstr "Wasser Hervorhebung"
 
 #: src/gui/userpalette.cpp:158
 msgid "Special ground collision Highlight"
-msgstr ""
+msgstr "Besondere Bodenkollision hervorheben"
 
 #: src/gui/userpalette.cpp:160
 msgid "Walkable Highlight"
@@ -4378,11 +4378,11 @@ msgstr "EINST"
 msgid "Select World"
 msgstr "Welt wählen"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr "Login ändern"
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr "Wähle Welt"
 
@@ -4985,16 +4985,16 @@ msgstr "\"Kein Flüstern mehr ignorieren\""
 msgid "All whispers unignore failed."
 msgstr "\"Kein Flüstern mehr ignorieren\" hat nicht funktioniert."
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "Benutzer Online: %d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "Spiel"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr "Verlassen verweigert!"
 
diff --git a/po/es.po b/po/es.po
index b038c2188..f11bb27fa 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
-"PO-Revision-Date: 2012-05-31 22:03+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
+"PO-Revision-Date: 2012-06-04 17:38+0000\n"
+"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/language/es/)\n"
 "Language: es\n"
@@ -32,7 +32,7 @@ msgstr "Ignorando las peticiones de intercambio"
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/actorspritemanager.cpp:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
@@ -49,12 +49,12 @@ msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "I"
 
@@ -137,7 +137,7 @@ msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
@@ -456,7 +456,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -492,11 +492,11 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -599,8 +599,8 @@ msgstr "^"
 msgid "Race:"
 msgstr "Race:"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "Crear"
 
@@ -674,23 +674,23 @@ msgstr "Ingrese la contraseña para borrar el personaje"
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "Nivel: %d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "(vacío)"
 
@@ -969,7 +969,7 @@ msgstr "Abrir automáticamente esta ventana"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -1130,11 +1130,11 @@ msgstr "Agregar a las ventas de la tienda."
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ", "
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1364,7 +1364,7 @@ msgid "Outfit: %d"
 msgstr "Conjuntos: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -1517,7 +1517,7 @@ msgstr "Habilitar ausencia"
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "Dejar"
 
@@ -1620,7 +1620,7 @@ msgstr "Copiar al chat"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1701,11 +1701,11 @@ msgstr "Remover de lista de recogido"
 msgid "Add to pickup list"
 msgstr "Agregar a lista de recogido"
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Cambiar de servidor"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Cambiar de personaje"
 
@@ -2984,7 +2984,7 @@ msgstr "Habilitar extensiones de textura rectangulares (OpenGL)"
 
 #: src/gui/setup_perfomance.cpp:102
 msgid "Use new texture internal format (OpenGL)"
-msgstr ""
+msgstr "Usar nuevo formato de textura interna (OpenGL)"
 
 #: src/gui/setup_players.cpp:53
 msgid "Show gender"
@@ -3036,7 +3036,7 @@ msgstr "Grupo de amigos en la ventana de conectados"
 
 #: src/gui/setup_players.cpp:89
 msgid "Hide erased players nicks"
-msgstr ""
+msgstr "Ocultar los nicks de jugadores borrados"
 
 #: src/gui/setup_relations.cpp:63
 msgid "Relation"
@@ -3254,7 +3254,7 @@ msgstr "Límite FPS alternativo: "
 
 #: src/gui/setup_video.cpp:244
 msgid "Detect best mode"
-msgstr ""
+msgstr "Detectar el mejor modo"
 
 #: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
 #: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
@@ -3569,153 +3569,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr "¿Estás seguro de que quieres dejar el grupo %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr "Navegación"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr "Ataque"
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr "Criaturas prioritarias"
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "Criaturas atacadas"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr "Criaturas ignoradas"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr "Pik"
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr "Recoger Items"
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr "Ignorar Items"
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "Crear Clan"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "Crear grupo"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación al clan de  %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitación al clan de %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando clan llamado %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "Nombre del clan"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "Escoge el nombre de tu clan."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del clan, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado al clan %s."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al clan"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr "Fuiste invitado a un grupo."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, 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:1557
+#: src/gui/socialwindow.cpp:1552
 #, 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:1562
+#: src/gui/socialwindow.cpp:1557
 #, 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:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 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:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "Escoge el nombre del grupo."
 
@@ -3811,51 +3811,51 @@ msgstr "Magia Astral"
 msgid "Command Editor"
 msgstr "Editor de comando"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "otro"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "Símbolo:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "Maná:"
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "Tipo de objetivo:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "Ícono:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "Maná:"
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "Nivel de Magia:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "Escuela de Magia:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "Nivel de Escuela:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "Guardar"
 
@@ -3907,33 +3907,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "Jugar"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1  El proceso de actualización esta incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Es altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr "##1  lo intentes de nuevo más tarde."
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "Completado"
 
@@ -4059,7 +4059,7 @@ msgstr "resaltado de colisión en el Agua"
 
 #: src/gui/userpalette.cpp:158
 msgid "Special ground collision Highlight"
-msgstr ""
+msgstr "Resaltado especial de colisión de terreno."
 
 #: src/gui/userpalette.cpp:160
 msgid "Walkable Highlight"
@@ -4364,11 +4364,11 @@ msgstr "SET"
 msgid "Select World"
 msgstr "Seleccionar Mundo"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr "Cambiar de Login"
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr "Escojer Mundo"
 
@@ -4969,16 +4969,16 @@ msgstr "Todos los susurros des-ignorados."
 msgid "All whispers unignore failed."
 msgstr "Ignorar todos los susurros ha fallado."
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "Jugadores conectados: %d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "Juego"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr "¡Petición de salida denegada!"
 
diff --git a/po/fi.po b/po/fi.po
index acbd962c6..dfd7620f5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
 "PO-Revision-Date: 2012-05-31 22:03+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
@@ -44,12 +44,12 @@ msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "-"
 
@@ -132,7 +132,7 @@ msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -452,7 +452,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -488,11 +488,11 @@ msgstr "Myy"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "Peru"
 
@@ -595,8 +595,8 @@ msgstr ""
 msgid "Race:"
 msgstr "Rotu: "
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "Luo"
 
@@ -670,23 +670,23 @@ msgstr "Anna salasana hahmon poistamiseksi"
 msgid "Enter password:"
 msgstr "Salasana:"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "Valitse"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "Taso %d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "(tyhjä)"
 
@@ -965,7 +965,7 @@ msgstr "Avaa tämä ikkuna automaattisesti"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -1125,11 +1125,11 @@ msgstr "Lisää myyntikauppaan."
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ", "
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "Paino: %s"
@@ -1359,7 +1359,7 @@ msgid "Outfit: %d"
 msgstr "Asu: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "Näppäin: %s"
@@ -1512,7 +1512,7 @@ msgstr "Ota poissaolo käyttöön"
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "Eroa"
 
@@ -1615,7 +1615,7 @@ msgstr "Kopioi keskusteluun"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1696,11 +1696,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Vaihda palvelinta"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Vaihda hahmoa"
 
@@ -3560,153 +3560,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr "Haluatko varmasti erota ryhmästä %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr "Hyö"
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr "Priorisoidut kohteet"
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "Hyökkäyskohteet"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr "Ohitettavat kohteet"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "Luo kilta"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "Luo ryhmä"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Suhteet"
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "Kutsu"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Luon killan %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "Luon ryhmän %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "Killan nimi"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "Valitse killallesi nimi."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, 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:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr "Sinut on kutsuttu liittymään ryhmään."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, 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:1557
+#: src/gui/socialwindow.cpp:1552
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1557
 #, 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:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 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:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
@@ -3802,51 +3802,51 @@ msgstr "Astraalimagia"
 msgid "Command Editor"
 msgstr "Komentomuokkain"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "muu"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "Symboli:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "Komento:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr "Kommentti:"
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "Mana:"
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "Kohdetyyppi:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "Kuvake:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "Mana:"
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "Magiataso:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "Magian koulukunta:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "Koulukunnan taso:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "Tallenna"
 
@@ -3896,33 +3896,33 @@ msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "Pelaa"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitysprosessi keskeytyi"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Suosittelemme vahvasti että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen"
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "Valmis"
 
@@ -4354,11 +4354,11 @@ msgstr "Ase"
 msgid "Select World"
 msgstr "Valitse pelimaailma"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr "Vaihda kirjautumistietoja"
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr "Valitse pelimaailma"
 
@@ -4957,16 +4957,16 @@ msgstr "Kaikki kuiskaukset huomioidaan taas."
 msgid "All whispers unignore failed."
 msgstr "Kuiskausten huomiointi epäonnistui."
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "Käyttäjiä palvelimella: %d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "Peli"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr "Lopetuspyyntö evätty!"
 
diff --git a/po/fr.po b/po/fr.po
index 87c2b0429..04f27a173 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
-"PO-Revision-Date: 2012-05-31 22:03+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
+"PO-Revision-Date: 2012-06-05 12:08+0000\n"
+"Last-Translator: Bernard <nard@bh28.net>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -34,7 +34,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:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
@@ -51,12 +51,12 @@ msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "I"
 
@@ -139,7 +139,7 @@ msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, 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."
@@ -461,7 +461,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -497,11 +497,11 @@ msgstr "Vendre"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -604,8 +604,8 @@ msgstr "^"
 msgid "Race:"
 msgstr "Race:"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "Créer"
 
@@ -679,23 +679,23 @@ msgstr "Entrer le mot de passe pour effacer le personnage"
 msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "Choisir"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "Niveau %d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "(vide)"
 
@@ -974,7 +974,7 @@ msgstr "Ouverture automatique de cette fenêtre"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -1134,11 +1134,11 @@ msgstr "Ajouter à la boutique de ventes."
 msgid "Unknown."
 msgstr "Inconnu."
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ","
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "Poids : %s"
@@ -1368,7 +1368,7 @@ msgid "Outfit: %d"
 msgstr "Tenue : %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "Touche : %s"
@@ -1521,7 +1521,7 @@ msgstr "Active la fonction Absence"
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "Quitter"
 
@@ -1624,7 +1624,7 @@ msgstr "Copier dans la conversation"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1705,11 +1705,11 @@ msgstr "Retirer de la liste de ramassage"
 msgid "Add to pickup list"
 msgstr "Ajouter à la liste de ramassage"
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Changer de serveur"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Changer de personnage"
 
@@ -2988,7 +2988,7 @@ msgstr "Activer l'extension de texture rectangulaire (OpenGL)"
 
 #: src/gui/setup_perfomance.cpp:102
 msgid "Use new texture internal format (OpenGL)"
-msgstr "Utiliser le nouveau format de texture interne (OpenGL)"
+msgstr "Utiliser le nouveau format interne de texture  (OpenGL)"
 
 #: src/gui/setup_players.cpp:53
 msgid "Show gender"
@@ -3578,157 +3578,157 @@ msgid "Are you sure you want to leave party %s?"
 msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr "Atq"
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr "Monstres prioritaires"
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "Attaquer les monstres"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr "Ignorer les monstres"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr "Pik"
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr "Ramasser les objets"
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr "Ignorer les objets"
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "Créer une Guilde"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "Créer un groupe"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr "F"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "Choisissez le nom de la guilde."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 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:1513
+#: src/gui/socialwindow.cpp:1508
 #, 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:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 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:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, 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:1557
+#: src/gui/socialwindow.cpp:1552
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1557
 #, 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:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 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:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr "Nom du groupe"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "Choisissez le nom du groupe."
 
@@ -3824,51 +3824,51 @@ msgstr "Magie Astrale"
 msgid "Command Editor"
 msgstr "Éditeur de commande"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "Magie"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "Autre"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "Symbole : "
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "Commande :"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr "Commentaire : "
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "Mana : "
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "Type de cible"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "Icône : "
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "Mana : "
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "Niveau de Magie :"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "École de magie : "
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "Niveau scolaire : "
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -3920,33 +3920,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "Mise à jour en cours..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé de"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr "##1 Essayez à nouveau plus tard"
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "Terminé"
 
@@ -4072,7 +4072,7 @@ msgstr "Surbrillance des zones de collision : Eau"
 
 #: src/gui/userpalette.cpp:158
 msgid "Special ground collision Highlight"
-msgstr ""
+msgstr "Surlignement des carreaux de collision du sol"
 
 #: src/gui/userpalette.cpp:160
 msgid "Walkable Highlight"
@@ -4381,11 +4381,11 @@ msgstr "Cfg"
 msgid "Select World"
 msgstr "Sélection du monde"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr "Changer de Compte"
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr "Choix du monde"
 
@@ -4993,16 +4993,16 @@ msgstr "Tous les chuchotements ne sont plus ignorés."
 msgid "All whispers unignore failed."
 msgstr "La remise en activité de tous les chuchotements a échoué"
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "Joueurs en ligne : %d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "Jeu"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr "Requête de départ refusée !"
 
diff --git a/po/id.po b/po/id.po
index b4c0f1c43..0a67ce596 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
 "PO-Revision-Date: 2012-05-31 22:03+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/"
@@ -29,7 +29,7 @@ msgstr "Abaikan permohonan transaksi"
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/actorspritemanager.cpp:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
@@ -46,12 +46,12 @@ msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "l"
 
@@ -134,7 +134,7 @@ msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
@@ -448,7 +448,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -484,11 +484,11 @@ msgstr "Jual"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "Batal"
 
@@ -591,8 +591,8 @@ msgstr ""
 msgid "Race:"
 msgstr "Ras:"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "Buat"
 
@@ -666,23 +666,23 @@ msgstr "Masukan Sandi untuk menghapus karakter"
 msgid "Enter password:"
 msgstr "Masukkan sandi"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "Pilih"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "Level %d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "(kosong)"
 
@@ -961,7 +961,7 @@ msgstr "Buka jendela otomatis"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -1121,11 +1121,11 @@ msgstr "Tambahkan ke daftar jual"
 msgid "Unknown."
 msgstr "Tidak diketahui"
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ","
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "Berat: %s"
@@ -1353,7 +1353,7 @@ msgid "Outfit: %d"
 msgstr "Setelan: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "Kunci: %s"
@@ -1506,7 +1506,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr ""
 
@@ -1609,7 +1609,7 @@ msgstr "Pindahkan ke chat"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(kembalikan)"
 
@@ -1690,11 +1690,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Ganti Server"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Ganti Karakter"
 
@@ -3550,153 +3550,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr "Sedang meninggalkan keyboard"
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr "mob prioritas"
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "serang mob"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr "Abaikan mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1552
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3792,51 +3792,51 @@ msgstr "Sihir Astral"
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "sihir"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "lainnya"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "Simbol:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "Perintah:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "Mana:"
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "Tipe target:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "Ikon:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "Mana:"
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "Level sihir:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "Sekolah sihir:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "Level sekolah:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "Simpan"
 
@@ -3886,33 +3886,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "Mengupdate..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "Main"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr ""
 
@@ -4339,11 +4339,11 @@ msgstr ""
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr ""
 
@@ -4940,16 +4940,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 6ef1f090d..762ca63bf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
 "PO-Revision-Date: 2012-05-31 22:03+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/"
@@ -31,7 +31,7 @@ msgstr "トレードリクエストを無効にしています"
 msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
-#: src/actorspritemanager.cpp:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
@@ -48,12 +48,12 @@ msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "I"
 
@@ -136,7 +136,7 @@ msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう"
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません"
@@ -450,7 +450,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -486,11 +486,11 @@ msgstr "売る"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -593,8 +593,8 @@ msgstr "^"
 msgid "Race:"
 msgstr "人種:"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "作成"
 
@@ -668,23 +668,23 @@ msgstr "キャラクターを削除するにはパスワードを入力して下
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "削除"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "選択"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "レベル%d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "(空)"
 
@@ -963,7 +963,7 @@ msgstr "この窓を自動で開ける"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -1123,11 +1123,11 @@ msgstr "販売リストに追加"
 msgid "Unknown."
 msgstr "不明"
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ", "
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "重力: %s"
@@ -1355,7 +1355,7 @@ msgid "Outfit: %d"
 msgstr "服装: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "鍵: %s"
@@ -1508,7 +1508,7 @@ msgstr "AFKを有効にする"
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "退会"
 
@@ -1611,7 +1611,7 @@ msgstr "チャットへコピーする"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1692,11 +1692,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "サーバーを変更する"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "キャラクターを変更する"
 
@@ -3557,153 +3557,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr "パーティ %sから本当に退会しますか?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr "ナビ"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr "攻撃"
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr "優先される敵"
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "敵を攻撃する"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr "無視している敵"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "ギルドを作成する"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "パーティを作る"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "ソーシャル"
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "招待"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr "周囲"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr "友達"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%sからのパーティ招待を承認しました"
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからのパーティ招待を拒否しました"
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからのギルド招待を承認しました"
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからのギルド招待を拒否しました"
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド %sを作成しました"
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "パーティ %sを作成しました"
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "ギルド名"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "ギルド名を選んでください"
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr "ギルド招待を承認したが既に入会しています"
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%sがギルド %sへ招待しています"
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "ギルド招待を受け入れる"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 msgid "Received party request, but one already exists."
 msgstr "パーティ招待を承認したが既に入会しています"
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr "パーティに招待されました"
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "パーティ %sに招待されました"
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1552
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%sはあなたをパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 msgid "Cannot create party. You are already in a party"
 msgstr "パーティーを作成することはできません。もうパーティーに入っています"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr "パーティ名"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください"
 
@@ -3799,51 +3799,51 @@ msgstr "アストラル魔法"
 msgid "Command Editor"
 msgstr "コマンドエディタ"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "魔法"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "他"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "シンボル:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "コマンド:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr "コメント:"
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "マナ:"
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "ターゲットタイプ:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "アイコン:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "マナ:"
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "魔法レベル:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "魔法学園:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "学校レベル:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "セーブ"
 
@@ -3895,33 +3895,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "更新しています..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "プレイ"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1 する事を強く推奨します"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr "##1  しばらくたってからもう一度試してください"
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "完了"
 
@@ -4352,11 +4352,11 @@ msgstr "SET"
 msgid "Select World"
 msgstr "世界を選ぶ"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr "ログインの変更"
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr "世界の選択"
 
@@ -4958,16 +4958,16 @@ msgstr "全てのささやきを無視解除しました"
 msgid "All whispers unignore failed."
 msgstr "全てのささやきの無視解除に失敗しました"
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "オンラインユーザー: %d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "ゲーム"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr "今キャンセルできません"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index f73063376..3079e0a33 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-06-01 00:51+0300\n"
+"POT-Creation-Date: 2012-06-09 14:52+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:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr ""
 
@@ -43,12 +43,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr ""
 
@@ -131,7 +131,7 @@ msgid "Farewell, come back any time..."
 msgstr ""
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -447,7 +447,7 @@ msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -483,11 +483,11 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr ""
 
@@ -590,8 +590,8 @@ msgstr ""
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr ""
 
@@ -665,23 +665,23 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr ""
 
@@ -960,7 +960,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
@@ -1120,11 +1120,11 @@ msgstr ""
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1354,7 +1354,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1507,7 +1507,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr ""
 
@@ -1610,7 +1610,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr ""
 
@@ -1691,11 +1691,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -3551,153 +3551,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1552
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3793,51 +3793,51 @@ msgstr ""
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr ""
 
@@ -3887,33 +3887,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr ""
 
@@ -4340,11 +4340,11 @@ msgstr ""
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr ""
 
@@ -4942,16 +4942,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index ee453f13f..a3393cc1e 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
 "PO-Revision-Date: 2012-05-31 22:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/"
@@ -28,7 +28,7 @@ msgstr "Inkomende handelsaanvragen negeren"
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/actorspritemanager.cpp:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
@@ -45,12 +45,12 @@ msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "I"
 
@@ -133,7 +133,7 @@ msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -452,7 +452,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -488,11 +488,11 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -595,8 +595,8 @@ msgstr ""
 msgid "Race:"
 msgstr "Ras:"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -670,23 +670,23 @@ msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "Kies"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "Niveau %d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "(leeg)"
 
@@ -965,7 +965,7 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -1125,11 +1125,11 @@ msgstr "Toevoegen om te verkopen"
 msgid "Unknown."
 msgstr "Onbekend."
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ", "
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
@@ -1359,7 +1359,7 @@ msgid "Outfit: %d"
 msgstr "Kleren: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "Sleutel: %s"
@@ -1512,7 +1512,7 @@ msgstr "away aanzetten"
 msgid "Disable away"
 msgstr "away afzetten"
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -1615,7 +1615,7 @@ msgstr "Kopieer naar chat"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1696,11 +1696,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Van server wisselen"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Van personage wisselen"
 
@@ -3562,153 +3562,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr "Bent u zeker dat u groep %s wilt verlaten?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr "Aanv"
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "Groep aanmaken"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Sociaal"
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "Nodig uit"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Maken van guild %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "Maken van groep %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "Guild Naam"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "Kies uw guild naam"
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, 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:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1540
 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:1549
+#: src/gui/socialwindow.cpp:1544
 #, 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:1557
+#: src/gui/socialwindow.cpp:1552
 #, 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:1562
+#: src/gui/socialwindow.cpp:1557
 #, 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:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 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:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr "Groep Naam"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
@@ -3804,51 +3804,51 @@ msgstr ""
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "magie"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "ander"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "Symbool:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "Commando:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "Mana:"
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "Doel Type:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "Icoon:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "Mana:"
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "Magie niveau:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "Magie School:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "School niveau:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "Bewaren"
 
@@ -3900,33 +3900,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "Actualiseren..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -4362,11 +4362,11 @@ msgstr "OPT"
 msgid "Select World"
 msgstr "Selecteer Wereld"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr "Wijzig Login"
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr "Kies Wereld"
 
@@ -4966,16 +4966,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "Online gebruikers: %d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "Spel"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr "Aanvraag op de stoppen is geweigerd!"
 
diff --git a/po/pl.po b/po/pl.po
index 2b58c61ca..58ea5588d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
-"PO-Revision-Date: 2012-05-31 22:03+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
+"PO-Revision-Date: 2012-06-03 07:02+0000\n"
+"Last-Translator: derpella <matwa@poczta.pl>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/language/"
 "pl/)\n"
 "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:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
@@ -46,12 +46,12 @@ msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "I"
 
@@ -134,7 +134,7 @@ msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, 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."
@@ -456,7 +456,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -492,11 +492,11 @@ msgstr "Sprzedaj"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -599,8 +599,8 @@ msgstr "^"
 msgid "Race:"
 msgstr "Rasa:"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "Utwórz"
 
@@ -674,23 +674,23 @@ msgstr "Wprowadź hasło aby usunąć postać"
 msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "Wybierz"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "Poziom %d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "(puste)"
 
@@ -969,7 +969,7 @@ msgstr "Otwieraj to okno automatycznie"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
@@ -1129,11 +1129,11 @@ msgstr "Dodaj do sklepu (kupuj)"
 msgid "Unknown."
 msgstr "Nieznany obiekt"
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ", "
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "Waga: %s"
@@ -1365,7 +1365,7 @@ msgid "Outfit: %d"
 msgstr "Strój: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "Klawisz: %s"
@@ -1518,7 +1518,7 @@ msgstr "Włącz tryb AFK"
 msgid "Disable away"
 msgstr "Wyłącz tryb AFK"
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "Opuść"
 
@@ -1621,7 +1621,7 @@ msgstr "Skopiuj do czatu"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1702,11 +1702,11 @@ msgstr "Usuń z listy podnoszonych"
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Zmień serwer"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Zmień postać"
 
@@ -3569,153 +3569,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr "Na pewno opuścić grupę %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr "GPS"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr "Atk"
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr "Priorytetowe moby"
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "Atakuj moby"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr "Ignoruj moby"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr "Pod"
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr "Podnoś przedmioty"
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr "Ignoruj przedmioty"
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "Utwórz gildię"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "Utwórz grupę"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Społeczność"
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "Zaproś"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr "V"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr "F"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Akceptowano zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Tworzenie gildii o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "Tworzenie grupy o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "Nazwa gildii"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "Wybierz nazwę gildii."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr "Gildia o tej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił/a Cię do gildii %s."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "Akceptuj zaproszenie do gildii"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 msgid "Received party request, but one already exists."
 msgstr "Grupa o takiej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr "Zostałeś/aś zaproszony/a do grupy."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, 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:1557
+#: src/gui/socialwindow.cpp:1552
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił/a Cię do grupy."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił/a Cię do grupy %s ."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 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:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr "Nazwa grupy"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
@@ -3811,51 +3811,51 @@ msgstr "Magia Astralna"
 msgid "Command Editor"
 msgstr "Edytor poleceń"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "inne"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "Symbol:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "Polecenie:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "Mana:"
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "Rodzaj celu:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "Ikona:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "Mana:"
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "Poziom magii:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "Szkoła magii:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "Poziom szkoły:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "Zachowaj"
 
@@ -3907,33 +3907,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Imię: %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "Aktualizacja..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "Graj"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr "##1  Spróbuj ponownie później."
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -4059,7 +4059,7 @@ msgstr "Podświetlenie przeszkód wodnych"
 
 #: src/gui/userpalette.cpp:158
 msgid "Special ground collision Highlight"
-msgstr ""
+msgstr "Podświetlenie specjalnych terenów kolizyjnych"
 
 #: src/gui/userpalette.cpp:160
 msgid "Walkable Highlight"
@@ -4360,11 +4360,11 @@ msgstr "SET"
 msgid "Select World"
 msgstr "Wybierz świat"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr "Przeloguj się"
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr "Wybierz świat"
 
@@ -4963,16 +4963,16 @@ msgstr "Wszystkie szepty odignorowane."
 msgid "All whispers unignore failed."
 msgstr "Nie udało się odignorować wszystkich szeptów."
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "Gracze online: %d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "Gra"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr "Żądanie wyjścia odrzucone!"
 
diff --git a/po/pt.po b/po/pt.po
index b226201c1..23c434213 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
 "PO-Revision-Date: 2012-05-31 22:03+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/"
@@ -29,7 +29,7 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/actorspritemanager.cpp:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
@@ -46,12 +46,12 @@ msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "l"
 
@@ -134,7 +134,7 @@ msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, 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."
@@ -453,7 +453,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -489,11 +489,11 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -596,8 +596,8 @@ msgstr "^"
 msgid "Race:"
 msgstr "Corrida:"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "Criar"
 
@@ -671,23 +671,23 @@ msgstr "Entre com a Senha para Deletar o usuario"
 msgid "Enter password:"
 msgstr "Entre com a senha"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "Escolher"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "Nível %d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "(vazio)"
 
@@ -966,7 +966,7 @@ msgstr "Abrir automaticamente esta janela"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -1126,11 +1126,11 @@ msgstr "Adicionar na loja de venda"
 msgid "Unknown."
 msgstr "Desconhecido"
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ", "
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1360,7 +1360,7 @@ msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -1513,7 +1513,7 @@ msgstr "Habilitar longe do teclado"
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "Sair"
 
@@ -1616,7 +1616,7 @@ msgstr "Copiar para o chat"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1697,11 +1697,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Trocar servidor"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
@@ -3563,153 +3563,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr "Atq"
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr "Mobs Prioritarios"
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "Atacar Mobs"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, 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:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, 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:1557
+#: src/gui/socialwindow.cpp:1552
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1557
 #, 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:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 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:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -3805,51 +3805,51 @@ msgstr "Magia Astral"
 msgid "Command Editor"
 msgstr "Editor de comandos"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "Feitiço"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "Outro"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "Símbolo: "
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "Mana:"
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "Mana:"
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "Salvar"
 
@@ -3900,33 +3900,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "Concluído"
 
@@ -4355,11 +4355,11 @@ msgstr "CON"
 msgid "Select World"
 msgstr "Selecionar Mundo"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr "Trocar Login"
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
@@ -4962,16 +4962,16 @@ msgstr "Todos sussurros não-ignorados. "
 msgid "All whispers unignore failed."
 msgstr "Todos sussurros não-ignorados falharam. "
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "Jogadores online: %d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "Jogo"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr "Requisição de saída negada!"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2b8e9b7ee..15118b0f9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
 "PO-Revision-Date: 2012-05-31 22:03+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
@@ -32,7 +32,7 @@ msgstr "Ignorando propostas de negócios"
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/actorspritemanager.cpp:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
@@ -49,12 +49,12 @@ msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "I"
 
@@ -137,7 +137,7 @@ msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, 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."
@@ -456,7 +456,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -492,11 +492,11 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -599,8 +599,8 @@ msgstr "^"
 msgid "Race:"
 msgstr "Corrida:"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "Criar"
 
@@ -674,23 +674,23 @@ msgstr "Entre com a senha para apagar o personagem"
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "Escolher"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "Nível %d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "(vazio)"
 
@@ -969,7 +969,7 @@ msgstr "Auto abrir esta janela"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
@@ -1129,11 +1129,11 @@ msgstr "Adicionar na loja de venda"
 msgid "Unknown."
 msgstr "Desconhecido"
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ", "
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1363,7 +1363,7 @@ msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -1516,7 +1516,7 @@ msgstr "Habilitar modo indisponível"
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "Sair"
 
@@ -1619,7 +1619,7 @@ msgstr "Copiar para chat"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1700,11 +1700,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Trocar servidor"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
@@ -3567,153 +3567,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr "Ataque"
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr "Mobs prioritarios "
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "Atacar mobs"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, 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:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, 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:1557
+#: src/gui/socialwindow.cpp:1552
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1557
 #, 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:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 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:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -3809,51 +3809,51 @@ msgstr "Magia Astral"
 msgid "Command Editor"
 msgstr "Editor de comandos"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "Feitiço"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "Outro"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "Símbolo: "
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "Mana:"
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "Mana:"
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "Salvar"
 
@@ -3904,33 +3904,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "Concluído"
 
@@ -4359,11 +4359,11 @@ msgstr "CON"
 msgid "Select World"
 msgstr "Selecionar Mundo"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr "Trocar Login"
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
@@ -4965,16 +4965,16 @@ msgstr "Todos sussurros não-ignorados."
 msgid "All whispers unignore failed."
 msgstr "Todos sussurros não-ignorados falharam. "
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "Jogadores online: %d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "Jogo"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr "Requisição de saída negada!"
 
diff --git a/po/ru.po b/po/ru.po
index 2e769430a..84e02a6df 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
 "PO-Revision-Date: 2012-05-31 22:07+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/"
@@ -31,7 +31,7 @@ msgstr "Игнорировать предложения о торговле"
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/actorspritemanager.cpp:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
@@ -48,12 +48,12 @@ msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "Б"
 
@@ -136,7 +136,7 @@ msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
@@ -461,7 +461,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -497,11 +497,11 @@ msgstr "Продать"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -604,8 +604,8 @@ msgstr "^"
 msgid "Race:"
 msgstr "Раса:"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "Создать"
 
@@ -679,23 +679,23 @@ msgstr "Введите пароль для удаления персонажа"
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "Выбрать"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "Уровень: %d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "(пусто)"
 
@@ -974,7 +974,7 @@ msgstr "Автоматически открывать это окно"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "ОК"
 
@@ -1134,11 +1134,11 @@ msgstr "Добавить в список продажи."
 msgid "Unknown."
 msgstr "Неизвестно."
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ","
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "Вес: %s"
@@ -1370,7 +1370,7 @@ msgid "Outfit: %d"
 msgstr "Наряд: %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "Клавиша: %s"
@@ -1523,7 +1523,7 @@ msgstr "Рарешить режим отошел"
 msgid "Disable away"
 msgstr "Запретить режим отошел"
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -1626,7 +1626,7 @@ msgstr "Скопировать в чат"
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1707,11 +1707,11 @@ msgstr "Удалить из поднятия"
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Сменить сервер"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Сменить персонажа"
 
@@ -3581,153 +3581,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr "Вы действительно хотите покинуть группу %s?"
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr "Нав"
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr "Атк"
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr "Приоритетные монстры"
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "Атакуемые монстры"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr "Игнорируемые монстры"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr "Подб"
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr "Подбирать предметы"
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr "Игнорировать предметы"
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "Создать Гильдию"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "Создать группу"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr "Общество"
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "Пригласить"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr "И"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr "Д"
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принято приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "Имя гильдии"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "Выберите имя для гильдии."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в гильдию, но оно не первое."
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к гильдии %s."
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в гильдию"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но оно не порвое."
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr "Вас приглашают в группу."
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас приглашают присоединиться к группе %s."
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1552
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает Вас к себе в группу."
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 msgid "Cannot create party. You are already in a party"
 msgstr "Не удалось создать группу. Вы уже состоите в другой."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr "Имя группы"
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
@@ -3823,51 +3823,51 @@ msgstr "Астральная магия"
 msgid "Command Editor"
 msgstr "Редактор команд"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "Магия"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "Другое"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "Символ:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "Команда:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "Мана:"
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "Тип цели:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "Картинка:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "Мана:"
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "Уровень Магии:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "Школа Магии:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "Уровень школы:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "Сохранить"
 
@@ -3919,33 +3919,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "Играть"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен!"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "Завершено"
 
@@ -4375,11 +4375,11 @@ msgstr "ОПЦ"
 msgid "Select World"
 msgstr "Выбрать Сервер"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr "Сменить логин"
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr "Выберите сервер"
 
@@ -4981,16 +4981,16 @@ msgstr "Убрано игнорирование всех приватных со
 msgid "All whispers unignore failed."
 msgstr "Не удалось убрать игнорирование всех приватных сообщение."
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "Пользователей онлайн: %d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "Игра"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr "Запрос на выход отклонен!"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1d45da681..3367244da 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-01 00:51+0300\n"
+"POT-Creation-Date: 2012-06-09 14:52+0300\n"
 "PO-Revision-Date: 2012-05-31 22:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
@@ -29,7 +29,7 @@ msgstr "忽略新进的交易请求"
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/actorspritemanager.cpp:1244
+#: src/actorspritemanager.cpp:1262
 msgid "Visible on map"
 msgstr "在地图上可见"
 
@@ -46,12 +46,12 @@ msgid "miss"
 msgstr "无法出售无法出售的物品。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1615 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1614 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:773
+#: src/being.cpp:1619 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "I"
 
@@ -134,7 +134,7 @@ msgid "Farewell, come back any time..."
 msgstr "再见，随时欢迎回来... ..."
 
 #: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
-#: src/client.cpp:2143 src/client.cpp:2150
+#: src/client.cpp:2133 src/client.cpp:2140
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，并且无法创建！退出。"
@@ -445,7 +445,7 @@ msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
@@ -481,11 +481,11 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
 #: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
 #: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:57
+#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.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
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
 msgstr "取消"
 
@@ -588,8 +588,8 @@ msgstr ""
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1202
+#: src/gui/charcreatedialog.cpp:125 src/gui/charselectdialog.cpp:627
+#: src/gui/socialwindow.cpp:1197
 msgid "Create"
 msgstr "建立"
 
@@ -663,23 +663,23 @@ msgstr "删除字符输入的密码"
 msgid "Enter password:"
 msgstr "输入密码："
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
-#: src/gui/textcommandeditor.cpp:244
+#: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/charselectdialog.cpp:618
+#: src/gui/charselectdialog.cpp:615
 msgid "Choose"
 msgstr "选择"
 
-#: src/gui/charselectdialog.cpp:621
+#: src/gui/charselectdialog.cpp:618
 #, c-format
 msgid "Level %d"
 msgstr "等级 %d"
 
-#: src/gui/charselectdialog.cpp:632 src/gui/charselectdialog.cpp:633
+#: src/gui/charselectdialog.cpp:629 src/gui/charselectdialog.cpp:630
 msgid "(empty)"
 msgstr "()"
 
@@ -958,7 +958,7 @@ msgstr "自动打开这个窗口"
 
 #: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
-#: src/gui/quitdialog.cpp:56 src/gui/textdialog.cpp:50
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "确定"
 
@@ -1118,11 +1118,11 @@ msgstr "添加到出售商店。"
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr ","
 
-#: src/gui/itempopup.cpp:194
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "重量：%s"
@@ -1350,7 +1350,7 @@ msgid "Outfit: %d"
 msgstr "套装： %d"
 
 #: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:535
-#: src/gui/windowmenu.cpp:319
+#: src/gui/windowmenu.cpp:321
 #, c-format
 msgid "Key: %s"
 msgstr "按键：%s"
@@ -1503,7 +1503,7 @@ msgstr "启用远"
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1204
+#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1199
 msgid "Leave"
 msgstr "留下"
 
@@ -1606,7 +1606,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
-#: src/gui/socialwindow.cpp:885
+#: src/gui/socialwindow.cpp:883
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1687,11 +1687,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:54
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "交换服务器"
 
-#: src/gui/quitdialog.cpp:55
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "交换角色"
 
@@ -3547,153 +3547,153 @@ msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:600
+#: src/gui/socialwindow.cpp:598
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:933
+#: src/gui/socialwindow.cpp:930
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:957
+#: src/gui/socialwindow.cpp:954
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:955
 msgid "Attack mobs"
 msgstr "攻击暴徒"
 
-#: src/gui/socialwindow.cpp:959
+#: src/gui/socialwindow.cpp:956
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:988
+#: src/gui/socialwindow.cpp:984
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1012
+#: src/gui/socialwindow.cpp:1008
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013
+#: src/gui/socialwindow.cpp:1009
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1137
+#: src/gui/socialwindow.cpp:1132
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:1138 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1580
 msgid "Create Party"
 msgstr "建立"
 
-#: src/gui/socialwindow.cpp:1180 src/gui/windowmenu.cpp:100
+#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:100
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1198
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1214
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1223
+#: src/gui/socialwindow.cpp:1218
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1363
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1373
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1390
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1450
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s"
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1473
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的"
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1487
 msgid "Guild Name"
 msgstr "公会名称"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1488
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1502
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1508
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s"
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1514
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1529
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1540
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党。"
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1544
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队。"
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1552
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1581
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1586
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1587
 msgid "Choose your party's name."
 msgstr "选择n的名称。"
 
@@ -3789,51 +3789,51 @@ msgstr "星芒魔术"
 msgid "Command Editor"
 msgstr "命令编辑器"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:171
 msgid "magic"
 msgstr "魔术"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:172
 msgid "other"
 msgstr "其他"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:173
 msgid "Symbol:"
 msgstr "符号："
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:175
 msgid "Command:"
 msgstr "命令："
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:177
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
-msgid "Mana:"
-msgstr "法力："
-
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:180
 msgid "Target Type:"
 msgstr "目标类型："
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:183
 msgid "Icon:"
 msgstr "图示："
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:185
+msgid "Mana:"
+msgstr "法力："
+
+#: src/gui/textcommandeditor.cpp:187
 msgid "Magic level:"
 msgstr "魔法等级："
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:190
 msgid "Magic School:"
 msgstr "魔法学院："
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:192
 msgid "School level:"
 msgstr "学校层次："
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:195
 msgid "Save"
 msgstr "保存"
 
@@ -3883,33 +3883,33 @@ msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 msgid "Name: %s"
 msgstr "姓名：%s"
 
-#: src/gui/updaterwindow.cpp:142
+#: src/gui/updaterwindow.cpp:143
 msgid "Updating..."
 msgstr "更新..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/updaterwindow.cpp:172
+#: src/gui/updaterwindow.cpp:173
 msgid "Play"
 msgstr "开始"
 
-#: src/gui/updaterwindow.cpp:623
+#: src/gui/updaterwindow.cpp:633
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:625
+#: src/gui/updaterwindow.cpp:635
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:627
+#: src/gui/updaterwindow.cpp:637
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:803
+#: src/gui/updaterwindow.cpp:813
 msgid "Completed"
 msgstr "已完成"
 
@@ -4336,11 +4336,11 @@ msgstr "SET"
 msgid "Select World"
 msgstr "选择世界"
 
-#: src/gui/worldselectdialog.cpp:85
+#: src/gui/worldselectdialog.cpp:83
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:86
+#: src/gui/worldselectdialog.cpp:84
 msgid "Choose World"
 msgstr ""
 
@@ -4937,16 +4937,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:92
+#: src/net/ea/gamehandler.cpp:91
 #, c-format
 msgid "Online users: %d"
 msgstr "在线用户数：%d"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Game"
 msgstr "游戏"
 
-#: src/net/ea/gamehandler.cpp:104
+#: src/net/ea/gamehandler.cpp:103
 msgid "Request to quit denied!"
 msgstr ""