Rebuild language files.

1 files changed, 304 insertions, 285 deletions

diff --git a/po/es.po b/po/es.po
index 05c8175a8..684dac342 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-05-09 23:29+0300\n"
+"POT-Creation-Date: 2011-05-22 04:22+0300\n"
 "PO-Revision-Date: 2011-04-29 16:22+0000\n"
 "Last-Translator: nelson6e65 <nelson6eeduardo65@gmail.com>\n"
 "Language-Team: Spanish (Castilian) <>\n"
@@ -17,112 +17,112 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1022
+#: src/actorspritemanager.cpp:1028
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
-#: src/being.cpp:495
+#: src/being.cpp:504
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:495
+#: src/being.cpp:504
 msgid "miss"
 msgstr "falla"
 
-#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
+#: src/client.cpp:760 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:95
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:826
+#: src/client.cpp:834
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:857
+#: src/client.cpp:865
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:890
+#: src/client.cpp:898
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:982
+#: src/client.cpp:990
 msgid "Requesting characters"
 msgstr "Cargando jugadores"
 
-#: src/client.cpp:1013
+#: src/client.cpp:1021
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1023
+#: src/client.cpp:1031
 msgid "Changing game servers"
 msgstr "Cambiando el servidor del juego"
 
-#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
+#: src/client.cpp:1066 src/client.cpp:1073 src/client.cpp:1210
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
 #: src/gui/charcreatedialog.cpp:216 src/gui/charselectdialog.cpp:252
-#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:373
+#: src/gui/register.cpp:226 src/gui/serverdialog.cpp:389
 #: src/gui/unregisterdialog.cpp:135 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:188
 #: src/net/tmwa/charserverhandler.cpp:204
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1074
+#: src/client.cpp:1082
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1101
+#: src/client.cpp:1109
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1110
 msgid "Password changed successfully!"
 msgstr "¡La contraseña se cambió correctamente!"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1129
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1130
 msgid "Email changed successfully!"
 msgstr "¡Email modificado correctamente!"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1150
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1143
+#: src/client.cpp:1151
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
+#: src/client.cpp:1340 src/client.cpp:1370 src/client.cpp:1414
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/client.cpp:1535
+#: src/client.cpp:1543
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de actualización inválido: %s"
 
-#: src/client.cpp:1569 src/client.cpp:1575
+#: src/client.cpp:1577 src/client.cpp:1583
 msgid "Error creating updates directory!"
 msgstr "¡Error creando la carpeta de actualizaciones!"
 
-#: src/client.cpp:1596
+#: src/client.cpp:1604
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/commandhandler.cpp:289
+#: src/commandhandler.cpp:299
 msgid "Unknown command."
 msgstr "Comando desconocido."
 
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:399
 msgid "Cannot send empty whispers!"
 msgstr "¡No puedes enviar susurros vacíos!"
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:407
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -131,193 +131,201 @@ msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
 
-#: src/commandhandler.cpp:417
+#: src/commandhandler.cpp:427
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando la entrada del canal %s."
 
-#: src/commandhandler.cpp:433 src/net/tmwa/gui/partytab.cpp:123
+#: src/commandhandler.cpp:443 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
-#: src/commandhandler.cpp:444
+#: src/commandhandler.cpp:454
 msgid "Guild name is missing."
 msgstr "Falta el nombre del gremio."
 
-#: src/commandhandler.cpp:457 src/commandhandler.cpp:564
-#: src/commandhandler.cpp:605 src/commandhandler.cpp:635
+#: src/commandhandler.cpp:467 src/commandhandler.cpp:574
+#: src/commandhandler.cpp:615 src/commandhandler.cpp:645
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:508
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/commandhandler.cpp:498
+#: src/commandhandler.cpp:508
 msgid "Message closes chat."
 msgstr "Mensaje cierra el chat."
 
-#: src/commandhandler.cpp:509
+#: src/commandhandler.cpp:519
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
-#: src/commandhandler.cpp:515
+#: src/commandhandler.cpp:525
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:553
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:548
+#: src/commandhandler.cpp:558
 msgid "disregarded"
 msgstr "desatendido"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:563
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:572
+#: src/commandhandler.cpp:582
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya %s!"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:596
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Jugador %s exitosamente!"
 
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:604
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
-#: src/commandhandler.cpp:616
+#: src/commandhandler.cpp:626
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estaba ignorado!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:633
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:635
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
-#: src/commandhandler.cpp:642
+#: src/commandhandler.cpp:652
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
-#: src/commandhandler.cpp:653
+#: src/commandhandler.cpp:663
 msgid "Player successfully erased!"
 msgstr "¡Jugador borrado con éxito!"
 
-#: src/commandhandler.cpp:655
+#: src/commandhandler.cpp:665
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:958 src/commandhandler.cpp:1004
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:968
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:977
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:985
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:993
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:1001
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1080
 msgid "font cache size"
 msgstr "tamaño de caché de fuente"
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1092
 #, fuzzy
 msgid "Cache size:"
 msgstr "tamaño de caché de fuente"
 
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1096
 #, fuzzy
 msgid "Created:"
 msgstr "Creado: "
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1098
 #, fuzzy
 msgid "Deleted:"
 msgstr "Eliminado: "
 
+#: src/commandhandler.cpp:1145 src/commandhandler.cpp:1152
+msgid "Resource images:"
+msgstr ""
+
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource orphaned images:"
+msgstr ""
+
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
+#: src/game.cpp:232 src/gui/widgets/chattab.cpp:398
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:232 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:236 src/gui/debugwindow.cpp:52 src/gui/widgets/chattab.cpp:400
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:444
+#: src/game.cpp:449
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:452
+#: src/game.cpp:457
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:491
+#: src/game.cpp:496
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión del servidor."
 
-#: src/game.cpp:505
+#: src/game.cpp:510
 msgid "Network Error"
 msgstr "Error de conexión"
 
-#: src/game.cpp:1023
+#: src/game.cpp:1028
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las propuestas de intercambio"
 
-#: src/game.cpp:1030
+#: src/game.cpp:1035
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las propuestas de intercambio"
 
-#: src/game.cpp:1405
+#: src/game.cpp:1410
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1411
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -345,19 +353,19 @@ msgstr "Control de bot"
 msgid "Name"
 msgstr "Nombre"
 
-#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:124
-#: src/gui/popupmenu.cpp:261 src/gui/popupmenu.cpp:578
+#: src/gui/botcheckerwindow.cpp:295 src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:581
 #: src/keyboardconfig.cpp:46 src/net/tmwa/generalhandler.cpp:255
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:250
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:253
 #: src/keyboardconfig.cpp:60
 msgid "Talk"
 msgstr "Hablar"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:235
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:635
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:236
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:638
 msgid "Move"
 msgstr "Mover"
 
@@ -370,14 +378,14 @@ msgid "Reset"
 msgstr "Restablecer"
 
 #: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
-#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:641
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:423
+#: src/gui/popupmenu.cpp:645
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
-#: src/gui/sell.cpp:322
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300
+#: src/gui/selldialog.cpp:85 src/gui/selldialog.cpp:322
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Precio: %s / Total: %s"
@@ -386,7 +394,7 @@ msgstr "Precio: %s / Total: %s"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
-#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
+#: src/gui/selldialog.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
 msgstr "+"
 
@@ -394,19 +402,20 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
-#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
+#: src/gui/selldialog.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
-#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
-#: src/gui/serverdialog.cpp:264 src/keyboardconfig.cpp:277
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
+#: src/gui/selldialog.cpp:91 src/gui/serverdialog.cpp:282
+#: src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Salir"
 
-#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
-#: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
-#: src/gui/statuswindow.cpp:968
+#: src/gui/buydialog.cpp:97 src/gui/selldialog.cpp:92
+#: src/gui/statuswindow.cpp:488 src/gui/statuswindow.cpp:537
+#: src/gui/statuswindow.cpp:937 src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Máximo"
 
@@ -415,28 +424,29 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Tienda"
 
-#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:242
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:642 src/gui/sell.cpp:51 src/gui/sell.cpp:58
-#: src/gui/sell.cpp:90
+#: src/gui/buyselldialog.cpp:63 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:646 src/gui/selldialog.cpp:51
+#: src/gui/selldialog.cpp:58 src/gui/selldialog.cpp:90
 msgid "Sell"
 msgstr "Vender"
 
 #: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
 #: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
 #: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
-#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:305
-#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:427
-#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:473
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:506
-#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:710
-#: src/gui/popupmenu.cpp:1532 src/gui/popupmenu.cpp:1559
-#: src/gui/popupmenu.cpp:1604 src/gui/popupmenu.cpp:1642
-#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1780 src/gui/quitdialog.cpp:58
-#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:957
-#: src/gui/textcommandeditor.cpp:235 src/gui/textdialog.cpp:49
-#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:328 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:457 src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:490 src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:690 src/gui/popupmenu.cpp:714
+#: src/gui/popupmenu.cpp:1564 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1636 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1709 src/gui/popupmenu.cpp:1746
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1831
+#: src/gui/quitdialog.cpp:58 src/gui/register.cpp:80 src/gui/setup.cpp:65
+#: src/gui/socialwindow.cpp:957 src/gui/textcommandeditor.cpp:235
+#: src/gui/textdialog.cpp:49 src/gui/unregisterdialog.cpp:57
+#: src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -472,7 +482,7 @@ msgstr "Los e-mail son distintos."
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: src/gui/changepassworddialog.cpp:62 src/gui/login.cpp:92
+#: src/gui/changepassworddialog.cpp:62 src/gui/logindialog.cpp:92
 #: src/gui/register.cpp:74 src/gui/unregisterdialog.cpp:54
 msgid "Password:"
 msgstr "Contraseña:"
@@ -503,7 +513,7 @@ msgstr "Las nuevas contraseñas no concuerdan."
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: src/gui/charcreatedialog.cpp:71 src/gui/login.cpp:91
+#: src/gui/charcreatedialog.cpp:71 src/gui/logindialog.cpp:91
 #: src/gui/register.cpp:73
 msgid "Name:"
 msgstr "Nombre:"
@@ -605,7 +615,7 @@ msgstr "Fallo al borrar el personaje."
 msgid "Enter password:"
 msgstr "Contrasena incorrecta."
 
-#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:286
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
 #: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:238
 msgid "Delete"
@@ -681,7 +691,7 @@ msgid "rainbow 3"
 msgstr "arco iris 3"
 
 #: src/gui/chatwindow.cpp:139 src/gui/itemamountwindow.cpp:91
-#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/logindialog.cpp:76 src/gui/setup_players.cpp:216
 #: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
 #: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:99
 #: src/gui/textcommandeditor.cpp:138 src/gui/textcommandeditor.cpp:157
@@ -710,10 +720,10 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:351
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:593
-#: src/gui/popupmenu.cpp:601
+#: src/gui/confirmdialog.cpp:50 src/gui/popupmenu.cpp:141
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:360 src/gui/popupmenu.cpp:596
+#: src/gui/popupmenu.cpp:604
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -868,18 +878,18 @@ msgstr "Out: %d bytes/s"
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:48
-#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
+#: src/gui/tradewindow.cpp:82 src/gui/tradewindow.cpp:84
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:73 src/gui/windowmenu.cpp:71
+#: src/gui/equipmentwindow.cpp:76 src/gui/windowmenu.cpp:71
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
+#: src/gui/equipmentwindow.cpp:101 src/gui/inventorywindow.cpp:127
 #: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
-#: src/gui/popupmenu.cpp:1496 src/gui/popupmenu.cpp:1579
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1528 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1651
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -888,7 +898,7 @@ msgid "Help"
 msgstr "Ayuda"
 
 #: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
-#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:521
+#: src/gui/npcdialog.cpp:51 src/gui/popupmenu.cpp:524
 #: src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Cerrar"
@@ -923,31 +933,31 @@ msgid "id"
 msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
-#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1498
-#: src/gui/popupmenu.cpp:1581 src/gui/popupmenu.cpp:1621
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1530
+#: src/gui/popupmenu.cpp:1613 src/gui/popupmenu.cpp:1653
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
-#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1501
-#: src/gui/popupmenu.cpp:1554 src/gui/popupmenu.cpp:1585
-#: src/gui/popupmenu.cpp:1624
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1533
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1656
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
-#: src/gui/popupmenu.cpp:1504 src/gui/popupmenu.cpp:1589
-#: src/gui/popupmenu.cpp:1627
+#: src/gui/popupmenu.cpp:1536 src/gui/popupmenu.cpp:1621
+#: src/gui/popupmenu.cpp:1659
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1509
-#: src/gui/popupmenu.cpp:1594 src/gui/popupmenu.cpp:1632
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1541
+#: src/gui/popupmenu.cpp:1626 src/gui/popupmenu.cpp:1664
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
-#: src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:485
 msgid "Outfits"
 msgstr "Conjuntos"
 
@@ -956,17 +966,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
-#: src/gui/popupmenu.cpp:1477 src/gui/popupmenu.cpp:1597
-#: src/gui/popupmenu.cpp:1635 src/gui/setup.cpp:66
+#: src/gui/popupmenu.cpp:1509 src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1667 src/gui/setup.cpp:66
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1516
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1548
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1506
-#: src/gui/popupmenu.cpp:1591 src/gui/popupmenu.cpp:1629
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1538
+#: src/gui/popupmenu.cpp:1623 src/gui/popupmenu.cpp:1661
 #: src/gui/windowmenu.cpp:94
 msgid "Drop"
 msgstr "Tirar"
@@ -1131,44 +1141,44 @@ msgstr "?"
 msgid "Time before jacko spawn: jacko spawning"
 msgstr "Tiempo antes de que jacko desove: jacko desovando"
 
-#: src/gui/login.cpp:57
+#: src/gui/logindialog.cpp:57
 msgid "Normal"
 msgstr "Normal"
 
-#: src/gui/login.cpp:58
+#: src/gui/logindialog.cpp:58
 msgid "Auto Close"
 msgstr "Auto Cerrar"
 
-#: src/gui/login.cpp:59
+#: src/gui/logindialog.cpp:59
 msgid "Skip"
 msgstr "Saltar"
 
-#: src/gui/login.cpp:84 src/gui/login.cpp:120
+#: src/gui/logindialog.cpp:84 src/gui/logindialog.cpp:120
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:88 src/gui/serverdialog.cpp:231
+#: src/gui/logindialog.cpp:88 src/gui/serverdialog.cpp:241
 #: src/gui/widgets/chattab.cpp:171
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/login.cpp:93
+#: src/gui/logindialog.cpp:93
 msgid "Custom update host"
 msgstr "Host de actualización personalizado"
 
-#: src/gui/login.cpp:107
+#: src/gui/logindialog.cpp:107
 msgid "Remember username"
 msgstr "Recordar nombre de usuario"
 
-#: src/gui/login.cpp:108
+#: src/gui/logindialog.cpp:108
 msgid "Update:"
 msgstr "Actualizar:"
 
-#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
+#: src/gui/logindialog.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/login.cpp:119
+#: src/gui/logindialog.cpp:119
 msgid "Change Server"
 msgstr "Cambiar de servidor"
 
@@ -1228,7 +1238,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:523
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:526
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -1267,295 +1277,302 @@ msgstr "Quitárselo antes"
 msgid "Away outfit"
 msgstr "Fuera conjunto"
 
-#: src/gui/popupmenu.cpp:123 src/gui/popupmenu.cpp:577 src/gui/trade.cpp:83
-#: src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:580
+#: src/gui/tradewindow.cpp:83 src/gui/tradewindow.cpp:84
+#: src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
 msgstr "Intercambio"
 
-#: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
+#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:345
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:130 src/gui/popupmenu.cpp:585
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:351
+#: src/gui/popupmenu.cpp:592
 #, fuzzy
 msgid "Be friend"
 msgstr "amigo"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
-#: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
-#: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
-#: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
-#: src/gui/popupmenu.cpp:623
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:148
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:359 src/gui/popupmenu.cpp:378
+#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:626
 #, fuzzy
 msgid "Disregard"
 msgstr "Desconocido"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
-#: src/gui/popupmenu.cpp:352 src/gui/popupmenu.cpp:358
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
-#: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
-#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:152
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:355 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:597 src/gui/popupmenu.cpp:605
+#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:619
 #, fuzzy
 msgid "Erase"
 msgstr "Borrado"
 
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
-#: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
-#: src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:157 src/gui/popupmenu.cpp:166
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:365
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:624
 #, fuzzy
 msgid "Unignore"
 msgstr "Ignorar"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
-#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:609 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:380
+#: src/gui/popupmenu.cpp:612 src/gui/popupmenu.cpp:628
 #: src/playerrelations.cpp:404
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:633
+#: src/gui/popupmenu.cpp:185 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:636
 #, fuzzy
 msgid "Follow"
 msgstr "Seguir: "
 
-#: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:637
 #, fuzzy
 msgid "Imitation"
 msgstr "Imitacion: "
 
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:658
 #, fuzzy
 msgid "Invite to party"
 msgstr "Invitación de un miembro al grupo"
 
-#: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:663
 #, fuzzy
 msgid "Kick from party"
 msgstr "@@kick party|Sacar del grupo@@"
 
-#: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:677
 #, fuzzy
 msgid "Kick from guild"
 msgstr "Usted fue expulsado del gremio."
 
-#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:679
 #, fuzzy
 msgid "Change pos in guild"
 msgstr "@@guild-pos|Cambiar la posición en en gremio >@@"
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:681
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:685
 #, fuzzy
 msgid "Invite to guild"
 msgstr "Miembro invitado al clan."
 
-#: src/gui/popupmenu.cpp:232
+#: src/gui/popupmenu.cpp:233
 #, fuzzy
 msgid "Kick player"
 msgstr "Jugador VIP."
 
-#: src/gui/popupmenu.cpp:234
+#: src/gui/popupmenu.cpp:235
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:639
+#, fuzzy
+msgid "Show Items"
+msgstr "Mostrar nivel"
+
+#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:1828
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:270
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:281
 #, fuzzy
 msgid "Remove from attack list"
 msgstr "@@remove attack|Quitar de la lista de ataque@@"
 
-#: src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:287
 #, fuzzy
 msgid "Add to priority attack list"
 msgstr "@@add attack priority|Agregar a lista de ataque prioritaria@@"
 
-#: src/gui/popupmenu.cpp:286
+#: src/gui/popupmenu.cpp:289
 #, fuzzy
 msgid "Add to attack list"
 msgstr "@@add attack|Añadir a la lista de ataque@@"
 
-#: src/gui/popupmenu.cpp:289
+#: src/gui/popupmenu.cpp:292
 #, fuzzy
 msgid "Add to ignore list"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:305 src/gui/popupmenu.cpp:427
 #, fuzzy
 msgid "Add name to chat"
 msgstr "Añadir al chat"
 
-#: src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:453
 #, fuzzy
 msgid "Pick up"
 msgstr "Coger"
 
-#: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
-#: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
+#: src/gui/popupmenu.cpp:454 src/gui/popupmenu.cpp:1562
+#: src/gui/popupmenu.cpp:1630 src/gui/popupmenu.cpp:1668
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: src/gui/popupmenu.cpp:468
+#: src/gui/popupmenu.cpp:471
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
-#: src/gui/popupmenu.cpp:469
+#: src/gui/popupmenu.cpp:472
 #, fuzzy
 msgid "Rename"
 msgstr "Remover nombre"
 
-#: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:473 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1800 src/gui/popupmenu.cpp:1805
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:487
 #, fuzzy
 msgid "Load old outfits"
 msgstr "Cargar atajos antiguos de artículos"
 
-#: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
+#: src/gui/popupmenu.cpp:503 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr "Hechizos"
 
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:505
 #, fuzzy
 msgid "Load old spells"
 msgstr "@@load old spells|Cargar los hechizos antiguos@@"
 
-#: src/gui/popupmenu.cpp:503
+#: src/gui/popupmenu.cpp:506
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:532
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
-#: src/gui/popupmenu.cpp:534
+#: src/gui/popupmenu.cpp:537
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
-#: src/gui/popupmenu.cpp:539
+#: src/gui/popupmenu.cpp:542
 msgid "Dont remove name"
 msgstr "No remover nombre"
 
-#: src/gui/popupmenu.cpp:544
+#: src/gui/popupmenu.cpp:547
 msgid "Remove name"
 msgstr "Remover nombre"
 
-#: src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:552
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
-#: src/gui/popupmenu.cpp:554
+#: src/gui/popupmenu.cpp:557
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:560 src/gui/socialwindow.cpp:1019
+#: src/gui/popupmenu.cpp:563 src/gui/socialwindow.cpp:1019
 msgid "Leave"
 msgstr "Dejar"
 
-#: src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:698
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
-#: src/gui/popupmenu.cpp:1105
+#: src/gui/popupmenu.cpp:1115
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
-#: src/gui/popupmenu.cpp:1106
+#: src/gui/popupmenu.cpp:1116
 msgid "Name:                    "
 msgstr "Nombre:"
 
-#: src/gui/popupmenu.cpp:1460
+#: src/gui/popupmenu.cpp:1492
 msgid "Add to trade"
 msgstr "Agredar al intercambio"
 
-#: src/gui/popupmenu.cpp:1466
+#: src/gui/popupmenu.cpp:1498
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1469
+#: src/gui/popupmenu.cpp:1501
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1471
+#: src/gui/popupmenu.cpp:1503
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1483
+#: src/gui/popupmenu.cpp:1515
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1486
+#: src/gui/popupmenu.cpp:1518
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1488
+#: src/gui/popupmenu.cpp:1520
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1522
+#: src/gui/popupmenu.cpp:1554
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1525
+#: src/gui/popupmenu.cpp:1557
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1527
+#: src/gui/popupmenu.cpp:1559
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: src/gui/popupmenu.cpp:1557 src/gui/popupmenu.cpp:1602
+#: src/gui/popupmenu.cpp:1589 src/gui/popupmenu.cpp:1634
 msgid "Load old item shortcuts"
 msgstr "Cargar atajos antiguos de artículos"
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1672
 msgid "Load old drop shortcuts"
 msgstr "Cargar atajos antiguos de soltar (drop)"
 
-#: src/gui/popupmenu.cpp:1666 src/gui/popupmenu.cpp:1699
+#: src/gui/popupmenu.cpp:1698 src/gui/popupmenu.cpp:1731
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1672 src/gui/popupmenu.cpp:1705
+#: src/gui/popupmenu.cpp:1704 src/gui/popupmenu.cpp:1737
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1744
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:1730 src/gui/socialwindow.cpp:838
+#: src/gui/popupmenu.cpp:1762 src/gui/socialwindow.cpp:838
 #: src/gui/socialwindow.cpp:873 src/gui/socialwindow.cpp:908
 msgid "(default)"
 msgstr "(predeterminado)"
 
-#: src/gui/popupmenu.cpp:1742 src/gui/popupmenu.cpp:1760
+#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1792
 msgid "Move up"
 msgstr "Subir"
 
-#: src/gui/popupmenu.cpp:1747 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1797
 msgid "Move down"
 msgstr "Bajar"
 
@@ -1603,60 +1620,60 @@ msgstr "La contraseña debe tener como mínimo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/serverdialog.cpp:216
+#: src/gui/serverdialog.cpp:226
 msgid "Choose Your Server"
 msgstr "Escoja tu servidor"
 
-#: src/gui/serverdialog.cpp:232
+#: src/gui/serverdialog.cpp:242
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/gui/serverdialog.cpp:235
+#: src/gui/serverdialog.cpp:245
 msgid "Use same ip for game sub servers"
 msgstr "Usar el mismo ip para los subservidores del juego"
 
-#: src/gui/serverdialog.cpp:250
+#: src/gui/serverdialog.cpp:259
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:283
 msgid "Load"
 msgstr "Cargar"
 
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:284
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:267
+#: src/gui/serverdialog.cpp:285
 msgid "Custom Server"
 msgstr "Servidor propio"
 
-#: src/gui/serverdialog.cpp:374
+#: src/gui/serverdialog.cpp:390
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique el nombre y el puerto del servidor."
 
-#: src/gui/serverdialog.cpp:521
+#: src/gui/serverdialog.cpp:548
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:526
+#: src/gui/serverdialog.cpp:553
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
-#: src/gui/serverdialog.cpp:530
+#: src/gui/serverdialog.cpp:557
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:561
 msgid "Error retreiving server list!"
 msgstr "Error al recuperar la lista de servers!"
 
-#: src/gui/serverdialog.cpp:632
+#: src/gui/serverdialog.cpp:659
 msgid "requires a newer version"
 msgstr "requiere una version mas nueva"
 
-#: src/gui/serverdialog.cpp:634
+#: src/gui/serverdialog.cpp:661
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -2322,7 +2339,8 @@ msgstr "Comprar artículos"
 msgid "Sell items"
 msgstr "Vender artículos"
 
-#: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120 src/gui/trade.cpp:86
+#: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120
+#: src/gui/tradewindow.cpp:86
 msgid "Add"
 msgstr "Anadir"
 
@@ -3070,46 +3088,46 @@ msgstr "Nivel de Escuela:"
 msgid "Save"
 msgstr "Guardar"
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:55
 msgid "Propose trade"
 msgstr "Proponer el intercambio"
 
-#: src/gui/trade.cpp:56
+#: src/gui/tradewindow.cpp:56
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Esperando..."
 
-#: src/gui/trade.cpp:57
+#: src/gui/tradewindow.cpp:57
 msgid "Agree trade"
 msgstr "Aceptar intercambio"
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:58
 msgid "Agreed. Waiting..."
 msgstr "Aceptado. Esperando..."
 
-#: src/gui/trade.cpp:61
+#: src/gui/tradewindow.cpp:61
 msgid "Trade: You"
 msgstr "Intercambio: Tú"
 
-#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
+#: src/gui/tradewindow.cpp:108 src/gui/tradewindow.cpp:149
 #, c-format
 msgid "You get %s"
 msgstr "Tú recibes %s"
 
-#: src/gui/trade.cpp:109
+#: src/gui/tradewindow.cpp:109
 msgid "You give:"
 msgstr "Tú das:"
 
-#: src/gui/trade.cpp:113
+#: src/gui/tradewindow.cpp:113
 msgid "Change"
 msgstr "Cambiar"
 
-#: src/gui/trade.cpp:314
+#: src/gui/tradewindow.cpp:314
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
 
-#: src/gui/trade.cpp:359
+#: src/gui/tradewindow.cpp:359
 msgid "You don't have enough money."
 msgstr "No tienes dinero suficiente."
 
@@ -3937,64 +3955,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1364
+#: src/localplayer.cpp:1379
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1366
+#: src/localplayer.cpp:1381
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1368
+#: src/localplayer.cpp:1383
 msgid "Item is too far away"
 msgstr "El artículo está muy lejos"
 
-#: src/localplayer.cpp:1370
+#: src/localplayer.cpp:1385
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1372
+#: src/localplayer.cpp:1387
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1375
+#: src/localplayer.cpp:1390
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1378
+#: src/localplayer.cpp:1393
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1417
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
 msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3131
+#: src/localplayer.cpp:3146
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3435
+#: src/localplayer.cpp:3450
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3437 src/localplayer.cpp:3452
+#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3444
+#: src/localplayer.cpp:3459
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3446 src/localplayer.cpp:3454
+#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
 msgid "Imitation canceled"
 msgstr "Imitar cancelado"
 
-#: src/localplayer.cpp:3806
+#: src/localplayer.cpp:3821
 msgid "You see "
 msgstr "Ves "
 
@@ -4090,6 +4108,18 @@ msgstr "     --safemode       : Iniciar el juego en modo seguro"
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Deshabilita OpenGL en esta sesion"
 
+#: src/net/ea/buysellhandler.cpp:161
+msgid "Nothing to sell."
+msgstr "Nada que vender."
+
+#: src/net/ea/buysellhandler.cpp:169
+msgid "Thanks for buying."
+msgstr "Gracias por comprar."
+
+#: src/net/ea/buysellhandler.cpp:177
+msgid "Unable to buy."
+msgstr "Imposible comprar."
+
 #: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:248
 msgid "Strength"
 msgstr "Fuerza"
@@ -4467,39 +4497,27 @@ msgstr "Intercambio Cancelado."
 msgid "Trade completed."
 msgstr "Intercambio Realizado."
 
-#: src/net/tmwa/adminhandler.cpp:65
+#: src/net/tmwa/adminhandler.cpp:68
 msgid "Kick failed!"
 msgstr "Error al expulsar!"
 
-#: src/net/tmwa/adminhandler.cpp:67
+#: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick succeeded!"
 msgstr "Expulsado satisfactoriamente!"
 
-#: src/net/tmwa/buysellhandler.cpp:132
-msgid "Nothing to sell."
-msgstr "Nada que vender."
-
-#: src/net/tmwa/buysellhandler.cpp:139
-msgid "Thanks for buying."
-msgstr "Gracias por comprar."
-
-#: src/net/tmwa/buysellhandler.cpp:147
-msgid "Unable to buy."
-msgstr "Imposible comprar."
-
-#: src/net/tmwa/buysellhandler.cpp:155
+#: src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Gracias por vender."
 
-#: src/net/tmwa/buysellhandler.cpp:159
+#: src/net/tmwa/buysellhandler.cpp:133
 msgid "Unable to sell."
 msgstr "Imposible vender."
 
-#: src/net/tmwa/buysellhandler.cpp:162
+#: src/net/tmwa/buysellhandler.cpp:136
 msgid "Unable to sell while trading."
 msgstr "Incapaz de vender mientras intercambia."
 
-#: src/net/tmwa/buysellhandler.cpp:165
+#: src/net/tmwa/buysellhandler.cpp:139
 msgid "Unable to sell unsellable item."
 msgstr "Incapaz de vender artículo invendible."
 
@@ -4684,6 +4702,7 @@ msgid "M.Defense"
 msgstr "Defensa M."
 
 #: src/net/tmwa/generalhandler.cpp:259
+#, fuzzy
 msgid "% Accuracy"
 msgstr "% Presición"
 
@@ -5308,7 +5327,7 @@ msgid "Floating bubble"
 msgstr "Burbuja Flotante"
 
 #: src/resources/beinginfo.cpp:33 src/resources/itemdb.cpp:243
-#: src/resources/monsterdb.cpp:79
+#: src/resources/monsterdb.cpp:82
 msgid "unnamed"
 msgstr "anónimo"