Update and rebuild translations.

1 files changed, 299 insertions, 265 deletions

diff --git a/po/es.po b/po/es.po
index 10ad2a5e6..227ae2047 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-12-08 15:54+0300\n"
-"PO-Revision-Date: 2012-12-01 22:32+0000\n"
+"POT-Creation-Date: 2012-12-20 01:36+0300\n"
+"PO-Revision-Date: 2012-12-19 22:46+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
@@ -51,63 +51,63 @@ msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1620 src/gui/whoisonline.cpp:772
+#: src/being.cpp:1621 src/gui/whoisonline.cpp:772
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1625 src/gui/whoisonline.cpp:777
+#: src/being.cpp:1626 src/gui/whoisonline.cpp:777
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1079 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:169
+#: src/client.cpp:1080 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:169
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:1082 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1083 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Rendimiento"
 
-#: src/client.cpp:1084 src/gui/setup_video.cpp:243
+#: src/client.cpp:1085 src/gui/setup_video.cpp:243
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:1086
+#: src/client.cpp:1087
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1089 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1090 src/gui/didyouknowwindow.cpp:71
 #: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
-#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:501
+#: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:503
 #: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/client.cpp:1179
+#: src/client.cpp:1180
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:1221
+#: src/client.cpp:1222
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1260
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1373
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1410
+#: src/client.cpp:1411
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1422
+#: src/client.cpp:1423
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1478 src/client.cpp:1488 src/client.cpp:1647
+#: src/client.cpp:1479 src/client.cpp:1489 src/client.cpp:1648
 #: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
 #: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -116,50 +116,50 @@ msgstr "Cambiando servidores del juego"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1500
+#: src/client.cpp:1501
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1536
+#: src/client.cpp:1537
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1537
+#: src/client.cpp:1538
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1557
+#: src/client.cpp:1558
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1558
+#: src/client.cpp:1559
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1578
+#: src/client.cpp:1579
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1579
+#: src/client.cpp:1580
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1826 src/client.cpp:1840 src/client.cpp:1876
-#: src/client.cpp:1891 src/client.cpp:2351 src/client.cpp:2358
+#: src/client.cpp:1827 src/client.cpp:1841 src/client.cpp:1877
+#: src/client.cpp:1892 src/client.cpp:2352 src/client.cpp:2359
 #, 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:2040
+#: src/client.cpp:2041
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:2079 src/client.cpp:2085
+#: src/client.cpp:2080 src/client.cpp:2086
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:2106 src/client.cpp:2118
+#: src/client.cpp:2107 src/client.cpp:2119
 #, 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."
@@ -344,28 +344,28 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
-#: src/game.cpp:258 src/gui/widgets/chattab.cpp:446
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:446
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:263 src/gui/debugwindow.cpp:50 src/gui/widgets/chattab.cpp:448
+#: src/game.cpp:264 src/gui/debugwindow.cpp:50 src/gui/widgets/chattab.cpp:448
 #: src/gui/windowmenu.cpp:161
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:540
+#: src/game.cpp:544
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:548
+#: src/game.cpp:552
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:612
+#: src/game.cpp:616
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
-#: src/game.cpp:613
+#: src/game.cpp:617
 msgid "Network Error"
 msgstr "Error de Red"
 
@@ -401,22 +401,22 @@ msgstr "Restablecer"
 msgid "Name"
 msgstr "Nombre"
 
-#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:132
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:543
+#: src/gui/botcheckerwindow.cpp:305 src/gui/popupmenu.cpp:134
+#: src/gui/popupmenu.cpp:214 src/gui/popupmenu.cpp:545
 #: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:265
 #: src/net/tmwa/generalhandler.cpp:274
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:201
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:203
 #: src/gui/setupactiondata.h:88
 msgid "Talk"
 msgstr "Hablar"
 
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:192
-#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:328
-#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:554
-#: src/gui/popupmenu.cpp:621 src/gui/setupactiondata.h:1552
+#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:446 src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:623 src/gui/setupactiondata.h:1552
 msgid "Move"
 msgstr "Mover"
 
@@ -425,8 +425,8 @@ msgid "Result"
 msgstr "Resultado"
 
 #: src/gui/buydialog.cpp:52 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:109
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:202
-#: src/gui/popupmenu.cpp:2130
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:204
+#: src/gui/popupmenu.cpp:2132
 msgid "Buy"
 msgstr "Comprar"
 
@@ -475,8 +475,8 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Tienda"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:203
-#: src/gui/popupmenu.cpp:2131 src/gui/selldialog.cpp:51
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:205
+#: src/gui/popupmenu.cpp:2133 src/gui/selldialog.cpp:51
 #: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:97
 msgid "Sell"
 msgstr "Vender"
@@ -485,20 +485,21 @@ msgstr "Vender"
 #: src/gui/changepassworddialog.cpp:54 src/gui/charcreatedialog.cpp:97
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:75
 #: src/gui/itemamountwindow.cpp:211 src/gui/npcpostdialog.cpp:60
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:362 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:463 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1712 src/gui/popupmenu.cpp:1740
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1860
-#: src/gui/popupmenu.cpp:1897 src/gui/popupmenu.cpp:1938
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:2015
-#: src/gui/popupmenu.cpp:2038 src/gui/quitdialog.cpp:61
-#: src/gui/registerdialog.cpp:73 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:74 src/gui/socialwindow.cpp:1185
-#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:52 src/gui/updaterwindow.cpp:160
+#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:288
+#: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:449
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:486
+#: src/gui/popupmenu.cpp:631 src/gui/popupmenu.cpp:656
+#: src/gui/popupmenu.cpp:1714 src/gui/popupmenu.cpp:1742
+#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1862
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1940
+#: src/gui/popupmenu.cpp:1993 src/gui/popupmenu.cpp:2017
+#: src/gui/popupmenu.cpp:2040 src/gui/popupmenu.cpp:2203
+#: src/gui/quitdialog.cpp:61 src/gui/registerdialog.cpp:73
+#: src/gui/setupactiondata.h:1500 src/gui/setup.cpp:76
+#: src/gui/socialwindow.cpp:1185 src/gui/textcommandeditor.cpp:194
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:52
+#: src/gui/updaterwindow.cpp:160
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -612,7 +613,7 @@ msgstr "Femenino"
 #: src/gui/charcreatedialog.cpp:91 src/gui/registerdialog.cpp:104
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:128 src/gui/setup_chat.cpp:131
-#: src/gui/setup_other.cpp:214 src/gui/setup_visual.cpp:100
+#: src/gui/setup_other.cpp:214 src/gui/setup_visual.cpp:110
 msgid "Other"
 msgstr "Otro"
 
@@ -694,14 +695,14 @@ msgstr "Seleccionar"
 #: src/gui/charselectdialog.cpp:628
 #, c-format
 msgid "Level %d"
-msgstr "Nivel: %d"
+msgstr "Nivel %d"
 
 #: src/gui/charselectdialog.cpp:639 src/gui/charselectdialog.cpp:640
 msgid "(empty)"
 msgstr "(vacío)"
 
 #: src/gui/chatwindow.cpp:138 src/gui/inventorywindow.cpp:63
-#: src/gui/setup_visual.cpp:105
+#: src/gui/setup_visual.cpp:112
 msgid "default"
 msgstr "predeterminado"
 
@@ -790,9 +791,9 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2063
-#: src/gui/popupmenu.cpp:2071 src/gui/popupmenu.cpp:2080
-#: src/gui/popupmenu.cpp:2099
+#: src/gui/confirmdialog.cpp:54 src/gui/popupmenu.cpp:2065
+#: src/gui/popupmenu.cpp:2073 src/gui/popupmenu.cpp:2082
+#: src/gui/popupmenu.cpp:2101
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -845,7 +846,7 @@ msgstr "Posición del jugador:"
 
 #: src/gui/debugwindow.cpp:160 src/gui/debugwindow.cpp:266
 msgid "Draw calls:"
-msgstr ""
+msgstr "Dibujar llamadas:"
 
 #: src/gui/debugwindow.cpp:162
 #, c-format
@@ -875,7 +876,7 @@ msgstr "%d FPS (OpenGL antiguo)"
 #: src/gui/debugwindow.cpp:182
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
-msgstr ""
+msgstr "%d FPS (OpenGL móvil)"
 
 #: src/gui/debugwindow.cpp:204 src/gui/debugwindow.cpp:260
 msgid "Textures count:"
@@ -1017,8 +1018,8 @@ msgid "Equipment"
 msgstr "Equipamiento"
 
 #: src/gui/equipmentwindow.cpp:60 src/gui/inventorywindow.cpp:168
-#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1667
-#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1825
+#: src/gui/inventorywindow.cpp:595 src/gui/popupmenu.cpp:1669
+#: src/gui/popupmenu.cpp:1771 src/gui/popupmenu.cpp:1827
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -1052,47 +1053,47 @@ msgid "Inventory"
 msgstr "Inventario"
 
 #: src/gui/inventorywindow.cpp:166 src/gui/inventorywindow.cpp:597
-#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1669
-#: src/gui/popupmenu.cpp:1771 src/gui/popupmenu.cpp:1827
+#: src/gui/outfitwindow.cpp:62 src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1773 src/gui/popupmenu.cpp:1829
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:167 src/gui/inventorywindow.cpp:601
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
-#: src/gui/skilldialog.cpp:240
+#: src/gui/popupmenu.cpp:1675 src/gui/popupmenu.cpp:1740
+#: src/gui/popupmenu.cpp:1777 src/gui/popupmenu.cpp:1833
+#: src/gui/skilldialog.cpp:250
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:180 src/gui/inventorywindow.cpp:697
-#: src/gui/popupmenu.cpp:1678 src/gui/popupmenu.cpp:1780
-#: src/gui/popupmenu.cpp:1836
+#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1687
-#: src/gui/popupmenu.cpp:1789 src/gui/popupmenu.cpp:1845
+#: src/gui/inventorywindow.cpp:181 src/gui/popupmenu.cpp:1689
+#: src/gui/popupmenu.cpp:1791 src/gui/popupmenu.cpp:1847
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:182 src/gui/outfitwindow.cpp:58
-#: src/gui/popupmenu.cpp:459 src/gui/setupactiondata.h:1556
+#: src/gui/popupmenu.cpp:461 src/gui/setupactiondata.h:1556
 #: src/gui/windowmenu.cpp:158
 msgid "Outfits"
 msgstr "Conjuntos"
 
 #: src/gui/inventorywindow.cpp:206 src/gui/inventorywindow.cpp:688
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1848 src/gui/setup.cpp:75
+#: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1850 src/gui/setup.cpp:77
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1694
+#: src/gui/inventorywindow.cpp:207 src/gui/popupmenu.cpp:1696
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1683
-#: src/gui/popupmenu.cpp:1785 src/gui/popupmenu.cpp:1841
+#: src/gui/inventorywindow.cpp:699 src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1787 src/gui/popupmenu.cpp:1843
 #: src/gui/windowmenu.cpp:148
 msgid "Drop"
 msgstr "Tirar"
@@ -1242,7 +1243,7 @@ msgstr "jacko apareciendo"
 msgid "You have left the guild."
 msgstr "Has dejado el clan."
 
-#: src/gui/logindialog.cpp:55
+#: src/gui/logindialog.cpp:55 src/gui/setup_touch.cpp:46
 msgid "Normal"
 msgstr "Normal"
 
@@ -1356,7 +1357,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:80 src/gui/popupmenu.cpp:505
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -1391,338 +1392,338 @@ msgstr "Conjunto para modo AFK"
 msgid "Key: %s"
 msgstr "Tecla: %s"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:542
+#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:544
 #: src/gui/widgets/tradetab.cpp:39
 msgid "Trade"
 msgstr "Intercambio"
 
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:306
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:308
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:547
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:549
 msgid "Heal"
 msgstr "Sanar"
 
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:343 src/gui/popupmenu.cpp:589
 msgid "Kick from guild"
 msgstr "Sacar del clan"
 
-#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:594
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el clan"
 
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:354
-#: src/gui/popupmenu.cpp:601
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:356
+#: src/gui/popupmenu.cpp:603
 msgid "Invite to guild"
 msgstr "Invitar al clan"
 
-#: src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:191
 msgid "Kick player"
 msgstr "Sacar jugador"
 
-#: src/gui/popupmenu.cpp:191
+#: src/gui/popupmenu.cpp:193
 msgid "Nuke"
 msgstr "Eliminar"
 
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:313
-#: src/gui/popupmenu.cpp:2171
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:2173
 msgid "Add comment"
 msgstr "Agregar comentario"
 
-#: src/gui/popupmenu.cpp:217
+#: src/gui/popupmenu.cpp:219
 msgid "Kick"
 msgstr "Sacar"
 
-#: src/gui/popupmenu.cpp:228
+#: src/gui/popupmenu.cpp:230
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
-#: src/gui/popupmenu.cpp:233
+#: src/gui/popupmenu.cpp:235
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritaria"
 
-#: src/gui/popupmenu.cpp:235
+#: src/gui/popupmenu.cpp:237
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:2186
+#: src/gui/popupmenu.cpp:239 src/gui/popupmenu.cpp:2188
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:360
+#: src/gui/popupmenu.cpp:252 src/gui/popupmenu.cpp:362
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
-#: src/gui/popupmenu.cpp:264 src/gui/setup_players.cpp:47
+#: src/gui/popupmenu.cpp:266 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Jugadores"
 
-#: src/gui/popupmenu.cpp:323 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2161
+#: src/gui/popupmenu.cpp:325 src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:2163
 msgid "Kick from party"
 msgstr "Sacar del grupo"
 
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:398
 msgid "Pick up"
 msgstr "Recoger"
 
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1795 src/gui/popupmenu.cpp:1851
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:440
+#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:442
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
-#: src/gui/popupmenu.cpp:418
+#: src/gui/popupmenu.cpp:420
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/gui/popupmenu.cpp:419 src/gui/popupmenu.cpp:1989
-#: src/gui/popupmenu.cpp:2013
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1991
+#: src/gui/popupmenu.cpp:2015
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:445
 msgid "Warp"
 msgstr "Deformar"
 
-#: src/gui/popupmenu.cpp:445
+#: src/gui/popupmenu.cpp:447
 msgid "Move camera"
 msgstr "Mover cámara"
 
-#: src/gui/popupmenu.cpp:460
+#: src/gui/popupmenu.cpp:462
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
-#: src/gui/popupmenu.cpp:480 src/gui/windowmenu.cpp:145
+#: src/gui/popupmenu.cpp:482 src/gui/windowmenu.cpp:145
 msgid "Spells"
 msgstr "Hechizos"
 
-#: src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:483
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
-#: src/gui/popupmenu.cpp:507
+#: src/gui/popupmenu.cpp:509
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
-#: src/gui/popupmenu.cpp:509
+#: src/gui/popupmenu.cpp:511
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
-#: src/gui/popupmenu.cpp:511
+#: src/gui/popupmenu.cpp:513
 msgid "Don't remove name"
 msgstr "No remover nombre"
 
-#: src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:515
 msgid "Remove name"
 msgstr "Remover nombre"
 
-#: src/gui/popupmenu.cpp:515
+#: src/gui/popupmenu.cpp:517
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
-#: src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:519
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:522 src/gui/socialwindow.cpp:1247
+#: src/gui/popupmenu.cpp:524 src/gui/socialwindow.cpp:1247
 msgid "Leave"
 msgstr "Dejar"
 
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:527
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2159
+#: src/gui/popupmenu.cpp:567 src/gui/popupmenu.cpp:2161
 msgid "Invite to party"
 msgstr "Invitar a grupo"
 
-#: src/gui/popupmenu.cpp:637
+#: src/gui/popupmenu.cpp:639
 msgid "Change guild position"
 msgstr "Cambiar posición del Clan"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1153
+#: src/gui/popupmenu.cpp:1155
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1155
+#: src/gui/popupmenu.cpp:1157
 msgid "Name:                    "
 msgstr "Nombre:                    "
 
-#: src/gui/popupmenu.cpp:1178
+#: src/gui/popupmenu.cpp:1180
 msgid "Player comment            "
 msgstr "Comentario del jugador            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1180
+#: src/gui/popupmenu.cpp:1182
 msgid "Comment:                      "
 msgstr "Comentario:                      "
 
-#: src/gui/popupmenu.cpp:1639
+#: src/gui/popupmenu.cpp:1641
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
-#: src/gui/popupmenu.cpp:1643
+#: src/gui/popupmenu.cpp:1645
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1644
+#: src/gui/popupmenu.cpp:1646
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1647
 msgid "Add to trade all-1"
 msgstr "Agregar el intercambio todo-1"
 
-#: src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1648
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1656
+#: src/gui/popupmenu.cpp:1658
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1659
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1660
 msgid "Store all-1"
 msgstr "Almacenar todo-1"
 
-#: src/gui/popupmenu.cpp:1659
+#: src/gui/popupmenu.cpp:1661
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1679 src/gui/popupmenu.cpp:1781
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/popupmenu.cpp:1681 src/gui/popupmenu.cpp:1783
+#: src/gui/popupmenu.cpp:1839
 msgid "Drop all"
 msgstr "Tirar todo"
 
-#: src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1700
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1699
+#: src/gui/popupmenu.cpp:1701
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1702
 msgid "Retrieve all-1"
 msgstr "Recuperar todo-1"
 
-#: src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1703
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: src/gui/popupmenu.cpp:1858
+#: src/gui/popupmenu.cpp:1860
 msgid "Clear drop window"
 msgstr "Limpiar ventana de lanzamiento"
 
-#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1923
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1925
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:1892 src/gui/popupmenu.cpp:1929
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1931
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:1935
+#: src/gui/popupmenu.cpp:1937
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:1937 src/gui/statuswindow.cpp:150
+#: src/gui/popupmenu.cpp:1939 src/gui/statuswindow.cpp:150
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
-#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:2009
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:2011
 #: src/gui/setup_theme.cpp:61 src/gui/setup_theme.cpp:125
 #: src/gui/socialwindow.cpp:919
 msgid "(default)"
 msgstr "(predeterminado)"
 
-#: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:1969 src/gui/popupmenu.cpp:1980
 msgid "Move up"
 msgstr "Subir"
 
-#: src/gui/popupmenu.cpp:1969 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:1971 src/gui/popupmenu.cpp:1982
 msgid "Move down"
 msgstr "Bajar"
 
-#: src/gui/popupmenu.cpp:2035 src/gui/popupmenu.cpp:2170
+#: src/gui/popupmenu.cpp:2037 src/gui/popupmenu.cpp:2172
 msgid "Undress"
 msgstr "Desvestir"
 
-#: src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2063
 msgid "Be friend"
 msgstr "Ser amigo"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/popupmenu.cpp:2070
-#: src/gui/popupmenu.cpp:2079 src/gui/popupmenu.cpp:2098
-#: src/gui/popupmenu.cpp:2106
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2072
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:2108
 msgid "Disregard"
 msgstr "Desatender"
 
-#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2072
-#: src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2102
 msgid "Black list"
 msgstr "Lista negra"
 
-#: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2073
-#: src/gui/popupmenu.cpp:2081
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2083
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
-#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2088
-#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2101
+#: src/gui/popupmenu.cpp:2068 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2090
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2103
 msgid "Erase"
 msgstr "Borrar"
 
-#: src/gui/popupmenu.cpp:2078 src/gui/popupmenu.cpp:2086
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2097
-#: src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2088
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2099
+#: src/gui/popupmenu.cpp:2107
 msgid "Unignore"
 msgstr "Des-ignorar"
 
-#: src/gui/popupmenu.cpp:2087 src/gui/popupmenu.cpp:2107
+#: src/gui/popupmenu.cpp:2089 src/gui/popupmenu.cpp:2109
 #: src/playerrelations.cpp:473
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:2117
+#: src/gui/popupmenu.cpp:2119
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2120
 msgid "Imitation"
 msgstr "Imitación"
 
-#: src/gui/popupmenu.cpp:2136 src/gui/popupmenu.cpp:2147
+#: src/gui/popupmenu.cpp:2138 src/gui/popupmenu.cpp:2149
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:2137 src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2139 src/gui/popupmenu.cpp:2150
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
-#: src/gui/popupmenu.cpp:2169
+#: src/gui/popupmenu.cpp:2171
 msgid "Show Items"
 msgstr "Mostrar artículos"
 
-#: src/gui/popupmenu.cpp:2180
+#: src/gui/popupmenu.cpp:2182
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
-#: src/gui/popupmenu.cpp:2184
+#: src/gui/popupmenu.cpp:2186
 msgid "Add to pickup list"
 msgstr "Agregar a lista de recogido"
 
@@ -1730,7 +1731,7 @@ msgstr "Agregar a lista de recogido"
 msgid "Quests"
 msgstr "Misiones"
 
-#: src/gui/questswindow.cpp:204 src/gui/setup_input.cpp:359
+#: src/gui/questswindow.cpp:204 src/gui/setup_input.cpp:353
 msgid "unknown"
 msgstr "Desconocido"
 
@@ -2651,11 +2652,11 @@ msgstr "Espectro"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:75
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:78
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
@@ -2675,19 +2676,15 @@ msgstr "Por defecto"
 msgid "Reset all keys"
 msgstr "Restablecer todas las teclas"
 
-#: src/gui/setup_input.cpp:104
-msgid "Show onscreen joystick"
-msgstr ""
-
-#: src/gui/setup_input.cpp:109
+#: src/gui/setup_input.cpp:106
 msgid "Input"
 msgstr "Entrada"
 
-#: src/gui/setup_input.cpp:198
+#: src/gui/setup_input.cpp:194
 msgid "Key Conflict(s) Detected."
 msgstr "Conflicto de teclas detectada."
 
-#: src/gui/setup_input.cpp:199
+#: src/gui/setup_input.cpp:195
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2820,7 +2817,7 @@ msgstr "Programa de movimientos locos A"
 
 #: src/gui/setup_other.cpp:114
 msgid "Mouse relative moves (good for touch interfaces)"
-msgstr ""
+msgstr "Movimientos relativos del ratón (bueno para interfaces táctiles)"
 
 #: src/gui/setup_other.cpp:118
 msgid "Player"
@@ -2971,22 +2968,26 @@ msgid "Enable OpenGL log"
 msgstr "Habilitar registro OpenGl"
 
 #: src/gui/setup_other.cpp:232
+msgid "Enable input log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:235
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:238
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite protector"
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:241
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr "Usar FBO para capturas de pantalla (sólo para opengl)"
 
-#: src/gui/setup_other.cpp:241
+#: src/gui/setup_other.cpp:244
 msgid "Network delay between sub servers"
 msgstr "Retraso de red entre sub servidores"
 
-#: src/gui/setup_other.cpp:244
+#: src/gui/setup_other.cpp:247
 msgid "Show background"
 msgstr "Mostrar fondo"
 
@@ -3332,11 +3333,43 @@ msgstr "Info del tema"
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:387 src/gui/setup_video.cpp:510
-#: src/gui/setup_video.cpp:517
+#: src/gui/setup_theme.cpp:387 src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:518
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el juego para que los cambios tengan efecto."
 
+#: src/gui/setup_touch.cpp:36
+msgid "Touch"
+msgstr ""
+
+#: src/gui/setup_touch.cpp:42
+msgid "Show on screen buttons"
+msgstr ""
+
+#: src/gui/setup_touch.cpp:45
+msgid "Small"
+msgstr ""
+
+#: src/gui/setup_touch.cpp:47
+msgid "Medium"
+msgstr ""
+
+#: src/gui/setup_touch.cpp:48
+msgid "Large"
+msgstr ""
+
+#: src/gui/setup_touch.cpp:49
+msgid "Buttons size"
+msgstr ""
+
+#: src/gui/setup_touch.cpp:52
+msgid "Show on screen joystick"
+msgstr ""
+
+#: src/gui/setup_touch.cpp:55
+msgid "Joystick size"
+msgstr ""
+
 #: src/gui/setup_video.cpp:180
 msgid "Software"
 msgstr "Software"
@@ -3359,7 +3392,7 @@ msgstr "Pantalla completa"
 
 #: src/gui/setup_video.cpp:225
 msgid "Show cursor"
-msgstr ""
+msgstr "Mostrar cursor"
 
 #: src/gui/setup_video.cpp:227
 msgid "Custom cursor"
@@ -3378,7 +3411,7 @@ msgid "FPS limit:"
 msgstr "Límite FPS:"
 
 #: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:267
-#: src/gui/setup_video.cpp:447 src/gui/setup_video.cpp:562
+#: src/gui/setup_video.cpp:448 src/gui/setup_video.cpp:563
 msgid "Alt FPS limit: "
 msgstr "Límite FPS alternativo: "
 
@@ -3387,8 +3420,8 @@ msgid "Detect best mode"
 msgstr "Detectar el mejor modo"
 
 #: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:548
-#: src/gui/setup_video.cpp:560
+#: src/gui/setup_video.cpp:447 src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:561
 msgid "None"
 msgstr "Nada"
 
@@ -3413,27 +3446,27 @@ msgstr "Cambiando a pantalla completa"
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:410
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:411
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:486
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
-#: src/gui/setup_video.cpp:486
+#: src/gui/setup_video.cpp:487
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:                "
 
-#: src/gui/setup_video.cpp:509 src/gui/setup_video.cpp:516
+#: src/gui/setup_video.cpp:510 src/gui/setup_video.cpp:517
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:512
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
@@ -3489,7 +3522,7 @@ msgstr "Burbujas con nombres"
 msgid "Overhead text"
 msgstr "Sobrecarga de texto"
 
-#: src/gui/setup_visual.cpp:77 src/gui/setup_visual.cpp:106
+#: src/gui/setup_visual.cpp:77 src/gui/setup_visual.cpp:113
 msgid "off"
 msgstr "apagado"
 
@@ -3537,23 +3570,27 @@ msgstr "Mejor rendimiento"
 msgid "Particle physics"
 msgstr "Particle physics"
 
-#: src/gui/setup_visual.cpp:102
+#: src/gui/setup_visual.cpp:101 src/gui/setup_visual.cpp:106
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/gui/setup_visual.cpp:107
+#: src/gui/setup_visual.cpp:103
+msgid "Enable gamma control"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:114
 msgid "on"
 msgstr "on"
 
-#: src/gui/setup_visual.cpp:108
+#: src/gui/setup_visual.cpp:115
 msgid "Vsync"
 msgstr "Vsync"
 
-#: src/gui/setup_visual.cpp:112
+#: src/gui/setup_visual.cpp:119
 msgid "Center game window"
 msgstr "Centralizar ventana"
 
-#: src/gui/setup_visual.cpp:116
+#: src/gui/setup_visual.cpp:123
 msgid "Allow screensaver to run"
 msgstr "Permitir ejecución de protector de pantalla"
 
@@ -3590,48 +3627,43 @@ msgstr "Propuesta de intercambio"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
 
-#: src/gui/skilldialog.cpp:236 src/gui/windowmenu.cpp:125
+#: src/gui/skilldialog.cpp:246 src/gui/windowmenu.cpp:125
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/skilldialog.cpp:241
+#: src/gui/skilldialog.cpp:251
 msgid "Up"
 msgstr "Incrementar"
 
-#: src/gui/skilldialog.cpp:349
+#: src/gui/skilldialog.cpp:359
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Puntos de habilidades: %d"
 
-#: src/gui/skilldialog.cpp:392
+#: src/gui/skilldialog.cpp:409
 msgid "basic"
 msgstr "básico"
 
-#: src/gui/skilldialog.cpp:393
-msgid "Skill: basic, Id: 1"
-msgstr "Habilidad: básico, Id: 1"
+#: src/gui/skilldialog.cpp:411
+msgid "basic, 1"
+msgstr ""
 
-#: src/gui/skilldialog.cpp:429
+#: src/gui/skilldialog.cpp:447
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidades %d"
 
-#: src/gui/skilldialog.cpp:442
+#: src/gui/skilldialog.cpp:474
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidad %d"
 
-#: src/gui/skilldialog.cpp:448
-#, c-format
-msgid "Skill: %s, Id: %d"
-msgstr "Habilidad: %s, Id: %d"
-
-#: src/gui/skilldialog.cpp:519 src/gui/skilldialog.cpp:610
+#: src/gui/skilldialog.cpp:553 src/gui/skilldialog.cpp:671
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/skilldialog.cpp:602
+#: src/gui/skilldialog.cpp:663
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nivel: %d (%+d)"
@@ -4427,7 +4459,7 @@ msgstr "Quién está conectado"
 #. TRANSLATORS: short button name for help window.
 #: src/gui/windowmenu.cpp:84
 msgid "HLP"
-msgstr ""
+msgstr "HLP"
 
 #. TRANSLATORS: short button name for quests window.
 #: src/gui/windowmenu.cpp:87
@@ -4455,7 +4487,7 @@ msgstr "Emotíconos"
 #. TRANSLATORS: short button name for chat window.
 #: src/gui/windowmenu.cpp:101
 msgid "CH"
-msgstr ""
+msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
 #: src/gui/windowmenu.cpp:109
@@ -4479,7 +4511,7 @@ msgstr "INV"
 #. TRANSLATORS: short button name for map window.
 #: src/gui/windowmenu.cpp:118
 msgid "MAP"
-msgstr ""
+msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
 #: src/gui/windowmenu.cpp:124
@@ -4523,17 +4555,17 @@ msgstr "¿Sabías que..."
 #. TRANSLATORS: short button name for shop window.
 #: src/gui/windowmenu.cpp:154
 msgid "SHP"
-msgstr ""
+msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
 #: src/gui/windowmenu.cpp:157
 msgid "OU"
-msgstr ""
+msgstr "OU"
 
 #. TRANSLATORS: short button name for debug window.
 #: src/gui/windowmenu.cpp:160
 msgid "DBG"
-msgstr ""
+msgstr "DBG"
 
 #. TRANSLATORS: short button name for setup window.
 #: src/gui/windowmenu.cpp:168
@@ -5080,7 +5112,7 @@ msgstr "Falla char-server desconocida."
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Error al crear personaje. Probablemente ya esté en uso."
 
-#: src/net/ea/charserverhandler.cpp:153 src/net/ea/loginhandler.cpp:262
+#: src/net/ea/charserverhandler.cpp:153 src/net/ea/loginhandler.cpp:265
 msgid "Wrong name."
 msgstr "Nombre equivocado."
 
@@ -5383,50 +5415,50 @@ msgstr "Fallo al usar el artículo."
 msgid "Unable to equip."
 msgstr "Imposible equipar."
 
-#: src/net/ea/loginhandler.cpp:147
+#: src/net/ea/loginhandler.cpp:149
 msgid "Account was not found. Please re-login."
 msgstr "Cuenta no encontrada. Por favor, vuelve a iniciar sesión."
 
-#: src/net/ea/loginhandler.cpp:150
+#: src/net/ea/loginhandler.cpp:152
 msgid "Old password incorrect."
 msgstr "Contraseña antigua incorrecta."
 
-#: src/net/ea/loginhandler.cpp:153
+#: src/net/ea/loginhandler.cpp:155
 msgid "New password too short."
 msgstr "Nueva contraseña es muy corta."
 
-#: src/net/ea/loginhandler.cpp:156 src/net/ea/loginhandler.cpp:271
+#: src/net/ea/loginhandler.cpp:158 src/net/ea/loginhandler.cpp:274
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: src/net/ea/loginhandler.cpp:230
+#: src/net/ea/loginhandler.cpp:232
 msgid "Unregistered ID."
 msgstr "ID no registrada."
 
-#: src/net/ea/loginhandler.cpp:233
+#: src/net/ea/loginhandler.cpp:235
 msgid "Wrong password."
 msgstr "Contraseña incorrecta."
 
-#: src/net/ea/loginhandler.cpp:236
+#: src/net/ea/loginhandler.cpp:239
 msgid "Account expired."
 msgstr "La cuenta expiró."
 
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:242
 msgid "Rejected from server."
 msgstr "Rechazado del servidor."
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:245
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Has sido proscrito permanentemente del juego. Por favor contacta con el "
 "equipo de GM."
 
-#: src/net/ea/loginhandler.cpp:246
+#: src/net/ea/loginhandler.cpp:249
 msgid "Client too old."
 msgstr "Cliente es demasiado antiguo."
 
-#: src/net/ea/loginhandler.cpp:249
+#: src/net/ea/loginhandler.cpp:252
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -5435,19 +5467,19 @@ msgstr ""
 "Has sido proscrito temporalmente del juego hasta %s.\n"
 "Por favor contacta al equipo de GM a través de los foros."
 
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:259
 msgid "Server overpopulated."
 msgstr "Servidor sobrepoblado."
 
-#: src/net/ea/loginhandler.cpp:259
+#: src/net/ea/loginhandler.cpp:262
 msgid "This user name is already taken."
 msgstr "Este nombre de usuario ya está escogido."
 
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:268
 msgid "Incorrect email."
-msgstr ""
+msgstr "E-mail incorrecto."
 
-#: src/net/ea/loginhandler.cpp:268
+#: src/net/ea/loginhandler.cpp:271
 msgid "Username permanently erased."
 msgstr "Nombre de usuario borrado permanentemente."
 
@@ -5915,13 +5947,14 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quiere comerciar contigo, aceptas?"
 
 #: src/net/ea/tradehandler.cpp:134
-msgid "Trading isn't possible. Trade partner is too far away."
+#, c-format
+msgid "Trading with %s isn't possible. Trade partner is too far away."
 msgstr ""
-"No es posible realizar el Intercambio. El otro personaje está muy alejado."
 
 #: src/net/ea/tradehandler.cpp:138
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "El intercambio no es posible. El personaje no existe."
+#, c-format
+msgid "Trading with %s isn't possible. Character doesn't exist."
+msgstr ""
 
 #: src/net/ea/tradehandler.cpp:142
 msgid "Trade cancelled due to an unknown reason."
@@ -5938,30 +5971,31 @@ msgid "Trade with %s cancelled."
 msgstr "Intercambio con %s cancelado."
 
 #: src/net/ea/tradehandler.cpp:171
-msgid "Unhandled trade cancel packet."
-msgstr "Intercambio no soportado."
+#, c-format
+msgid "Unhandled trade cancel packet with %s"
+msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Error al añadir objeto. El otro jugador lleva mucho peso."
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Error al añadir objeto. El otro jugador no tiene más espacio."
 
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr "Fallo al agregar artículo. No puedes intercambiar este artículo."
 
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr "Fallo al añaadir objeto por una razón desconocida."
 
-#: src/net/ea/tradehandler.cpp:269
+#: src/net/ea/tradehandler.cpp:270
 msgid "Trade canceled."
 msgstr "Intercambio Cancelado."
 
-#: src/net/ea/tradehandler.cpp:280
+#: src/net/ea/tradehandler.cpp:281
 msgid "Trade completed."
 msgstr "Intercambio Realizado."