Merge branch '0.0.28'

Conflicts:
	po/POTFILES.in
	src/main.cpp
	src/main.h
	tmw.cbp

1 files changed, 200 insertions, 180 deletions

diff --git a/po/es.po b/po/es.po
index 74226821..ec2eaa95 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-25 22:01+0100\n"
-"PO-Revision-Date: 2008-10-15 01:37+0000\n"
-"Last-Translator: catalania <Unknown>\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
+"PO-Revision-Date: 2009-01-27 13:52+0000\n"
+"Last-Translator: Habari <thomas.becerril@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
+"X-Launchpad-Export-Date: 2009-02-12 19:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
@@ -47,9 +47,8 @@ msgid "Effect: %s"
 msgstr "Efecto: %s"
 
 #: src/gui/buysell.cpp:31
-#, fuzzy
 msgid "Shop"
-msgstr "Detener"
+msgstr "tienda"
 
 #: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
 msgid "Sell"
@@ -58,14 +57,15 @@ msgstr "Vender"
 #: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
 #: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
 #: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: src/gui/char_select.cpp:63
 msgid "Confirm Character Delete"
-msgstr ""
+msgstr "confirmar borrado de personaje"
 
 #: src/gui/char_select.cpp:64
 msgid "Are you sure you want to delete this character?"
@@ -104,16 +104,16 @@ msgid "Name: %s"
 msgstr "Nombre: %s"
 
 #: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
 #: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
 #: src/gui/char_select.cpp:185
-#, fuzzy, c-format
+#, c-format
 msgid "Job Level: %d"
-msgstr "Nivel: %d"
+msgstr "nivel de trabajo %d"
 
 #: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
 #, c-format
@@ -123,7 +123,7 @@ msgstr "Dinero: %d"
 #: src/gui/char_select.cpp:174
 #, c-format
 msgid "Gold: %d"
-msgstr ""
+msgstr "oro: %d"
 
 #: src/gui/char_select.cpp:243
 msgid "Create Character"
@@ -146,23 +146,23 @@ msgid "Create"
 msgstr "Crear"
 
 #: src/gui/char_server.cpp:52
-#, fuzzy
 msgid "Select Server"
-msgstr "Seleccionar personaje"
+msgstr "Seleccionar servidor"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: src/gui/char_server.cpp:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
-msgstr ""
+msgstr "Aceptar"
 
 #: src/gui/chat.cpp:115
 msgid "Global announcement:"
-msgstr ""
+msgstr "Anuncio Global"
 
 #: src/gui/chat.cpp:118
 #, c-format
 msgid "Global announcement from %s:"
-msgstr ""
+msgstr "Anuncio global de %s"
 
 #: src/gui/chat.cpp:133 src/gui/login.cpp:46 src/gui/register.cpp:82
 msgid "Server:"
@@ -171,208 +171,209 @@ msgstr "Servidor:"
 #: src/gui/chat.cpp:139
 #, c-format
 msgid "%s whispers:"
-msgstr ""
+msgstr "%s susurra"
 
 #: src/gui/chat.cpp:276
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr ""
+msgstr "susurrando a %s: %s"
 
 #: src/gui/chat.cpp:349
 msgid "Unknown command"
-msgstr ""
+msgstr "Comando desconocido"
 
 #: src/gui/chat.cpp:359
 msgid "Trade failed!"
-msgstr ""
+msgstr "comercio fallido"
 
 #: src/gui/chat.cpp:362
 msgid "Emote failed!"
-msgstr ""
+msgstr "emcion fallida"
 
 #: src/gui/chat.cpp:365
 msgid "Sit failed!"
-msgstr ""
+msgstr "sentarse fallido"
 
 #: src/gui/chat.cpp:368
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "creacion de chat fallida"
 
 #: src/gui/chat.cpp:371
 msgid "Could not join party!"
-msgstr ""
+msgstr "no pudiste unirte al grupo"
 
 #: src/gui/chat.cpp:374
 msgid "Cannot shout!"
-msgstr ""
+msgstr "no puedes gritar"
 
 #: src/gui/chat.cpp:382
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "no has alcanzado un nivel suficientemente alto"
 
 #: src/gui/chat.cpp:385
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "puntos de vida insuficientes"
 
 #: src/gui/chat.cpp:388
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "SP insuficientes"
 
 #: src/gui/chat.cpp:391
 msgid "You have no memos!"
-msgstr ""
+msgstr "No tienes ningun memo"
 
 #: src/gui/chat.cpp:394
 msgid "You cannot do that right now!"
-msgstr ""
+msgstr "no puedes hacer eso ahora mismo"
 
 #: src/gui/chat.cpp:397
 msgid "Seems you need more Zeny... ;-)"
-msgstr ""
+msgstr "parece ser que necesitas mas zeny"
 
 #: src/gui/chat.cpp:400
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
+msgstr "no puedes usar esa habilidad con este tipo de arma"
 
 #: src/gui/chat.cpp:403
 msgid "You need another red gem!"
-msgstr ""
+msgstr "necesitas otra gmea roja"
 
 #: src/gui/chat.cpp:406
 msgid "You need another blue gem!"
-msgstr ""
+msgstr "necesitas otra gema azul"
 
 #: src/gui/chat.cpp:409
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "estas cargando demasiado de esto"
 
 #: src/gui/chat.cpp:412
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "¿eh? que es eso?"
 
 #: src/gui/chat.cpp:418
 msgid "Warp failed..."
-msgstr ""
+msgstr "teletransporte fallido"
 
 #: src/gui/chat.cpp:421
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "No pudiste robar nada"
 
 #: src/gui/chat.cpp:424
 msgid "Poison had no effect..."
-msgstr ""
+msgstr "el veneno no tuvo efecto"
 
 #: src/gui/chat.cpp:489
 msgid "-- Help --"
-msgstr ""
+msgstr "ayuda"
 
 #: src/gui/chat.cpp:492
 msgid "/announce: Global announcement (GM only)"
-msgstr ""
+msgstr "/announce ; anuncio global (GM solo)"
 
 #: src/gui/chat.cpp:493
 msgid "/clear: Clears this window"
-msgstr ""
+msgstr "/clear : limpia esta ventana"
 
 #: src/gui/chat.cpp:494
 msgid "/help: Display this help"
-msgstr ""
+msgstr "/help : muestra esta ayuda"
 
 #: src/gui/chat.cpp:495
 msgid "/where: Display map name"
-msgstr ""
+msgstr "/where : muestra nombre del mapa"
 
 #: src/gui/chat.cpp:496
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
-msgstr ""
+msgstr "/whisper <nick> <mensaje> : manda un <mensaje> privado para <nick>"
 
 #: src/gui/chat.cpp:498
 msgid "/w <nick> <message>: Short form for /whisper"
-msgstr ""
+msgstr "/w <nicl> <mensaje> abreviatura de /whisper"
 
 #: src/gui/chat.cpp:499
 msgid "/who: Display number of online users"
-msgstr ""
+msgstr "/who muestra el numero de jugadores online"
 
 #: src/gui/chat.cpp:500
 msgid "For more information, type /help <command>"
-msgstr ""
+msgstr "Par mas ayuda teclea el comando /help"
 
 #: src/gui/chat.cpp:505
 msgid "Command: /announce <msg>"
-msgstr ""
+msgstr "comando : /announce <mensaje>"
 
 #: src/gui/chat.cpp:506
 msgid "*** only available to a GM ***"
-msgstr ""
+msgstr "solo disponible para GM"
 
 #: src/gui/chat.cpp:507
 msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
+msgstr "este comando manda un mensaje a todos los jugadores que esten online"
 
 #: src/gui/chat.cpp:513
 msgid "Command: /clear"
-msgstr ""
+msgstr "comando: /clear"
 
 #: src/gui/chat.cpp:514
 msgid "This command clears the chat log of previous chat."
-msgstr ""
+msgstr "este comando borra"
 
 #: src/gui/chat.cpp:520
 msgid "Command: /help"
-msgstr ""
+msgstr "comando: /help"
 
 #: src/gui/chat.cpp:521
 msgid "This command displays a list of all commands available."
-msgstr ""
+msgstr "este comando da una lista de todos los comandos que hay"
 
 #: src/gui/chat.cpp:523
 msgid "Command: /help <command>"
-msgstr ""
+msgstr "comando: /help <comando>"
 
 #: src/gui/chat.cpp:524
 msgid "This command displays help on <command>."
-msgstr ""
+msgstr "este comando muestra ayuda sobre <otro comando>"
 
 #: src/gui/chat.cpp:529
 msgid "Command: /where"
-msgstr ""
+msgstr "comando: /where"
 
 #: src/gui/chat.cpp:530
 msgid "This command displays the name of the current map."
-msgstr ""
+msgstr "este comando muestra el nombre del mapa actual"
 
 #: src/gui/chat.cpp:536
 msgid "Command: /whisper <nick> <msg>"
-msgstr ""
+msgstr "comando: /whisper <mote> <mensaje>"
 
 #: src/gui/chat.cpp:537
 msgid "Command: /w <nick> <msg>"
-msgstr ""
+msgstr "comando: /w <mote> <mensaje>"
 
 #: src/gui/chat.cpp:538
 msgid "This command sends the message <msg> to <nick>."
-msgstr ""
+msgstr "este comando manda un mensaje <mensaje> a <mote>"
 
 #: src/gui/chat.cpp:540
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
+msgstr "si el <mote> incluye espacios , escribelo entre comillas (\"\")"
 
 #: src/gui/chat.cpp:546
 msgid "Command: /who"
-msgstr ""
+msgstr "comando: /who"
 
 #: src/gui/chat.cpp:547
 msgid "This command displays the number of players currently online."
 msgstr ""
+"este comando muestra el numero de jugadores que actualmente estan conectados"
 
 #: src/gui/chat.cpp:551
 msgid "Unknown command."
-msgstr ""
+msgstr "Orden desconocida."
 
 #: src/gui/chat.cpp:552
 msgid "Type /help for a list of commands."
-msgstr ""
+msgstr "teclea /help para una lista de comandos"
 
 #: src/gui/confirm_dialog.cpp:35
 msgid "Yes"
@@ -392,11 +393,11 @@ msgstr "Equipo"
 
 #: src/gui/help.cpp:33
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: src/gui/help.cpp:41
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
 msgid "Inventory"
@@ -414,12 +415,12 @@ msgstr "tirar"
 #: src/gui/inventorywindow.cpp:99
 #, c-format
 msgid "Weight: %d / %d"
-msgstr ""
+msgstr "peso: %d / %d"
 
 #: src/gui/inventorywindow.cpp:104
 #, c-format
 msgid "Slots used: %d / %d"
-msgstr ""
+msgstr "ranuras usadas : %d / %d"
 
 #: src/gui/inventorywindow.cpp:225
 msgid "Unequip"
@@ -447,7 +448,7 @@ msgstr "Contraseña:"
 
 #: src/gui/login.cpp:50
 msgid "Remember Username"
-msgstr ""
+msgstr "recordar nombre de usuario"
 
 #: src/gui/login.cpp:53 src/gui/register.cpp:75 src/gui/register.cpp:89
 msgid "Register"
@@ -465,7 +466,7 @@ msgstr "Habilidades"
 msgid "Shortcut"
 msgstr "Atajos"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Configuración"
 
@@ -473,10 +474,23 @@ msgstr "Configuración"
 msgid "MiniMap"
 msgstr "Minimapa"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "NPC"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "Registrar"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -502,9 +516,8 @@ msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Recoger %s@@"
 
 #: src/gui/popupmenu.cpp:283
-#, fuzzy
 msgid "@@use|Unequip@@"
-msgstr "@@use|Equipar@@"
+msgstr "@@usar|quitarselo@@"
 
 #: src/gui/popupmenu.cpp:285
 msgid "@@use|Equip@@"
@@ -528,11 +541,11 @@ msgstr "Confirmar:"
 
 #: src/gui/register.cpp:87
 msgid "Male"
-msgstr ""
+msgstr "Hombre"
 
 #: src/gui/register.cpp:88
 msgid "Female"
-msgstr ""
+msgstr "Mujer"
 
 #: src/gui/register.cpp:159
 #, c-format
@@ -558,22 +571,10 @@ msgstr "La contraseña puede tener como máximo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Error"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Sonido"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Volumen efectos"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Volumen musica"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Aplicar"
@@ -600,7 +601,19 @@ msgstr "Teclado"
 
 #: src/gui/setup.cpp:94
 msgid "Players"
-msgstr ""
+msgstr "Jugadores"
+
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Sonido"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Volumen efectos"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Volumen musica"
 
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
@@ -624,61 +637,59 @@ msgstr "Gire el stick"
 
 #: src/gui/setup_keyboard.cpp:88
 msgid "Assign"
-msgstr ""
+msgstr "Asignar"
 
 #: src/gui/setup_keyboard.cpp:92
-#, fuzzy
 msgid "Default"
-msgstr "Eliminar"
+msgstr "Predeterminado"
 
 #: src/gui/setup_keyboard.cpp:121
 msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "conflictos entre teclas detectados"
 
 #: src/gui/setup_keyboard.cpp:122
 msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr ""
+msgstr "resuelvelo , o el juego puede comportarse de manera extraña"
 
 #: src/gui/setup_players.cpp:55
-#, fuzzy
 msgid "Name"
 msgstr "Nombre:"
 
 #: src/gui/setup_players.cpp:56
 msgid "Relation"
-msgstr ""
+msgstr "Relacion"
 
 #: src/gui/setup_players.cpp:60
 msgid "Neutral"
-msgstr ""
+msgstr "Neutral"
 
 #: src/gui/setup_players.cpp:61
 msgid "Friend"
-msgstr ""
+msgstr "Amigo"
 
 #: src/gui/setup_players.cpp:62
 msgid "Disregarded"
-msgstr ""
+msgstr "desestimado"
 
 #: src/gui/setup_players.cpp:63
 msgid "Ignored"
-msgstr ""
+msgstr "Ingnorado"
 
 #: src/gui/setup_players.cpp:217
 msgid "Save player list"
-msgstr ""
+msgstr "guardar lista de jugdores"
 
 #: src/gui/setup_players.cpp:219
 msgid "Allow trading"
-msgstr ""
+msgstr "permitir comercio"
 
 #: src/gui/setup_players.cpp:221
 msgid "Allow whispers"
-msgstr ""
+msgstr "permitir susurros"
 
 #: src/gui/setup_players.cpp:248
 msgid "When ignoring:"
-msgstr ""
+msgstr "cuando ignorando"
 
 #: src/gui/setup_video.cpp:114
 msgid "Full screen"
@@ -714,7 +725,7 @@ msgstr "Efectos ambientales"
 
 #: src/gui/setup_video.cpp:144
 msgid "Particle Detail"
-msgstr ""
+msgstr "detalle particulas"
 
 #: src/gui/setup_video.cpp:198 src/gui/setup_video.cpp:398
 msgid "off"
@@ -732,11 +743,11 @@ msgstr "alto"
 
 #: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:418
 msgid "medium"
-msgstr ""
+msgstr "Medio"
 
 #: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:424
 msgid "max"
-msgstr ""
+msgstr "max"
 
 #: src/gui/setup_video.cpp:296
 msgid "Switching to full screen"
@@ -756,107 +767,115 @@ msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
 #: src/gui/skill.cpp:79
 msgid "Mystery Skill"
-msgstr ""
+msgstr "habilidad mis"
 
 #: src/gui/skill.cpp:132 src/gui/skill.cpp:188
 #, c-format
 msgid "Skill points: %d"
-msgstr ""
+msgstr "puntos de habilidad: %d"
 
 #: src/gui/skill.cpp:133
 msgid "Up"
-msgstr ""
+msgstr "Arriba"
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
-#, fuzzy, c-format
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
+#, c-format
 msgid "Job: %d"
-msgstr "Nivel: %d"
+msgstr "trabajo : %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
-#, fuzzy, c-format
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
+#, c-format
 msgid "Money: %d GP"
-msgstr "Dinero: %d"
+msgstr "dinero: %d GP"
 
-#: src/gui/status.cpp:127
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
 #, fuzzy
+msgid "Job:"
+msgstr "trabajo : %d"
+
+#: src/gui/status.cpp:127
 msgid "Stats"
-msgstr "Estado"
+msgstr "Estadísticas"
 
 #: src/gui/status.cpp:128
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #: src/gui/status.cpp:129
 msgid "Cost"
-msgstr ""
+msgstr "Coste"
 
 #: src/gui/status.cpp:132
-#, fuzzy
 msgid "Attack:"
-msgstr "Ataque %+d"
+msgstr "Ataque:"
 
 #: src/gui/status.cpp:133
-#, fuzzy
 msgid "Defense:"
-msgstr "Defensa %+d"
+msgstr "defensa"
 
 #: src/gui/status.cpp:134
-#, fuzzy
 msgid "M.Attack:"
-msgstr "Ataque %+d"
+msgstr "ataque magico"
 
 #: src/gui/status.cpp:135
-#, fuzzy
 msgid "M.Defense:"
-msgstr "Defensa %+d"
+msgstr "defensa magica"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
-msgstr ""
+msgstr "% AcPunteria"
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
-msgstr ""
+msgstr "% agilidad"
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
-msgstr ""
+msgstr "% reflejos"
 
-#: src/gui/status.cpp:282
-#, fuzzy
+#: src/gui/status.cpp:285
 msgid "Strength"
-msgstr "Fuerza:"
+msgstr "Fuerza"
 
-#: src/gui/status.cpp:283
-#, fuzzy
+#: src/gui/status.cpp:286
 msgid "Agility"
-msgstr "Agilidad:"
+msgstr "agilidad2"
 
-#: src/gui/status.cpp:284
-#, fuzzy
+#: src/gui/status.cpp:287
 msgid "Vitality"
-msgstr "Vitalidad:"
+msgstr "vitalidad"
 
-#: src/gui/status.cpp:285
-#, fuzzy
+#: src/gui/status.cpp:288
 msgid "Intelligence"
-msgstr "Inteligencia:"
+msgstr "inteligencia"
 
-#: src/gui/status.cpp:286
-#, fuzzy
+#: src/gui/status.cpp:289
 msgid "Dexterity"
-msgstr "Destreza:"
+msgstr "Destreza"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
-msgstr ""
+msgstr "Suerte"
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
-msgstr ""
+msgstr "puntos de estatus que te quedan: %d"
 
 #: src/gui/trade.cpp:61
 msgid "Add"
@@ -864,7 +883,7 @@ msgstr "Añadir"
 
 #: src/gui/trade.cpp:64
 msgid "Trade"
-msgstr ""
+msgstr "Comercio"
 
 #: src/gui/trade.cpp:80 src/gui/trade.cpp:161 src/gui/trade.cpp:209
 #, c-format
@@ -878,39 +897,43 @@ msgstr "Tu das:"
 #: src/gui/trade.cpp:290
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"no se pudo añadir objeto: No puedes sobreponer un tipo de objeto en la "
+"ventana"
 
 #: src/gui/updatewindow.cpp:93
 msgid "Updating..."
-msgstr ""
+msgstr "Actualizando ..."
 
 #: src/gui/updatewindow.cpp:119
 msgid "Play"
-msgstr ""
+msgstr "Jugar"
 
 #: src/gui/updatewindow.cpp:526
 msgid "Completed"
-msgstr ""
-
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
+msgstr "Terminado"
 
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
-msgstr ""
+msgstr "fuiste desconectado del servidor!!"
 
-#: src/main.cpp:956
-#, fuzzy
+#: src/main.cpp:965
 msgid "Connecting to map server..."
-msgstr "Conectando…"
+msgstr "conectando al servidor de mapas...."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
-msgstr ""
+msgstr "conectando al servidor de personajes..."
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
-msgstr ""
+msgstr "conectando al servidor de cuentas de usuario..."
+
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr "sin nombre"
+
+#~ msgid "Change"
+#~ msgstr "Modificar"
 
 #~ msgid "Unregister"
 #~ msgstr "Cancelar Cuenta"
@@ -963,9 +986,6 @@ msgstr ""
 #~ msgid "Confirm trade"
 #~ msgstr "Confirmar"
 
-#~ msgid "Change"
-#~ msgstr "Modificar"
-
 #~ msgid "HP %+d"
 #~ msgstr "HP %+d"