Rebuild and update translations.

1 files changed, 322 insertions, 318 deletions

diff --git a/po/es.po b/po/es.po
index 9152e77ed..232a4efb1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-16 22:38+0300\n"
-"PO-Revision-Date: 2012-03-16 19:43+0000\n"
+"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/language/es/)\n"
@@ -23,13 +23,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: src/actionmanager.cpp:817
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorando las peticiones de intercambio"
+
+#: src/actionmanager.cpp:826
+msgid "Accepting incoming trade requests"
+msgstr "Aceptando las peticiones de intercambio"
+
 #: src/actorspritemanager.cpp:1164
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
 #: src/being.cpp:344
 msgid "Human"
-msgstr ""
+msgstr "Humano"
 
 #: src/being.cpp:561
 msgid "dodge"
@@ -40,16 +48,16 @@ msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1595 src/gui/whoisonline.cpp:763
+#: src/being.cpp:1595 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1600 src/gui/whoisonline.cpp:768
+#: src/being.cpp:1600 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+#: src/client.cpp:969 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:102
 msgid "Setup"
 msgstr "Configuración"
 
@@ -327,43 +335,35 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+#: src/game.cpp:243 src/gui/widgets/chattab.cpp:433
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+#: src/game.cpp:247 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:435
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:513
+#: src/game.cpp:505
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:521
+#: src/game.cpp:513
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:563
+#: src/game.cpp:555
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
-#: src/game.cpp:564
+#: src/game.cpp:556
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1277
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorando las peticiones de intercambio"
-
-#: src/game.cpp:1287
-msgid "Accepting incoming trade requests"
-msgstr "Aceptando las peticiones de intercambio"
-
-#: src/game.cpp:1801
+#: src/game.cpp:1087
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1802
+#: src/game.cpp:1088
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -397,13 +397,13 @@ msgid "Name"
 msgstr "Nombre"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:139
-#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693
-#: src/keyboardconfig.cpp:53 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:693 src/keyboarddata.h:82
+#: src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:298
-#: src/keyboardconfig.cpp:66
+#: src/keyboarddata.h:124
 msgid "Talk"
 msgstr "Hablar"
 
@@ -457,7 +457,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:88
+#: src/keyboarddata.h:208
 msgid "Quit"
 msgstr "Salir"
 
@@ -571,14 +571,14 @@ msgstr "Nombre:"
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
 #: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
-#: src/gui/outfitwindow.cpp:85
+#: src/gui/outfitwindow.cpp:88
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
-#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:87
 msgid "<"
 msgstr "<"
 
@@ -612,8 +612,8 @@ msgid "Female"
 msgstr "Femenino"
 
 #: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:103
-#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
-#: src/gui/setup_other.cpp:165 src/gui/setup_visual.cpp:86
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:128
+#: src/gui/setup_other.cpp:170 src/gui/setup_visual.cpp:86
 msgid "Other"
 msgstr "Otro"
 
@@ -691,64 +691,64 @@ msgstr "Nivel: %d"
 msgid "(empty)"
 msgstr "(vacío)"
 
-#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:70
 #: src/gui/setup_visual.cpp:92
 msgid "default"
 msgstr "predeterminado"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:119
 msgid "black"
 msgstr "negro"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:120
 msgid "red"
 msgstr "rojo"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:121
 msgid "green"
 msgstr "verde"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:122
 msgid "blue"
 msgstr "azul"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:123
 msgid "gold"
 msgstr "dorado"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:124
 msgid "yellow"
 msgstr "amarillo"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:125
 msgid "pink"
 msgstr "rosa"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:126
 msgid "purple"
 msgstr "púrpura"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:127
 msgid "grey"
 msgstr "gris"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:128
 msgid "brown"
 msgstr "marrón"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 1"
 msgstr "arco iris 1"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:130
 msgid "rainbow 2"
 msgstr "arco iris 2"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:131
 msgid "rainbow 3"
 msgstr "arco iris 3"
 
-#: src/gui/chatwindow.cpp:147 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
@@ -758,16 +758,16 @@ msgstr "arco iris 3"
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:157 src/gui/setup_chat.cpp:47
+#: src/gui/chatwindow.cpp:159 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:656
+#: src/gui/chatwindow.cpp:665
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores están presentes."
 
-#: src/gui/chatwindow.cpp:1043
+#: src/gui/chatwindow.cpp:1052
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
@@ -878,19 +878,19 @@ msgstr "Id de Objetivo:"
 
 #: src/gui/debugwindow.cpp:272
 msgid "Target level:"
-msgstr ""
+msgstr "Nivel del objetivo:"
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
 msgid "Target race:"
-msgstr ""
+msgstr "Raza del objetivo:"
 
 #: src/gui/debugwindow.cpp:274
 msgid "Target party:"
-msgstr ""
+msgstr "Grupo de objetivo:"
 
 #: src/gui/debugwindow.cpp:275
 msgid "Target guild:"
-msgstr ""
+msgstr "Gremio del objetivo:"
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
 #: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
@@ -940,25 +940,25 @@ msgstr "Recibiendo: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Enviando: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:48
+#: src/gui/didyouknowwindow.cpp:51
 msgid "Did You Know?"
 msgstr "¿Sabías que...?"
 
-#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
 #: src/gui/inventorywindow.cpp:203 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:651 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:68
 msgid "< Previous"
 msgstr "< Previo"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:69
 msgid "Next >"
 msgstr "Siguiente >"
 
-#: src/gui/didyouknowwindow.cpp:67
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Auto open this window"
 msgstr "Abrir automáticamente esta ventana"
 
@@ -993,17 +993,17 @@ msgid "Please at least type both the address and the port of the server."
 msgstr ""
 "Por favor, por lo menos especifique el nombre y el puerto del servidor."
 
-#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:65 src/gui/windowmenu.cpp:76
 msgid "Equipment"
 msgstr "Equipamiento"
 
-#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
-#: src/gui/inventorywindow.cpp:539 src/gui/popupmenu.cpp:1855
+#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:544 src/gui/popupmenu.cpp:1855
 #: src/gui/popupmenu.cpp:1951 src/gui/popupmenu.cpp:1998
 msgid "Unequip"
 msgstr "Quitárselo"
 
-#: src/gui/helpwindow.cpp:44
+#: src/gui/helpwindow.cpp:47
 msgid "Help"
 msgstr "Ayuda"
 
@@ -1027,7 +1027,7 @@ msgstr "por cantidad"
 msgid "by type"
 msgstr "por tipo"
 
-#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:78
 #: src/inventory.cpp:250
 msgid "Inventory"
 msgstr "Inventario"
@@ -1040,20 +1040,20 @@ msgstr "Espacios:"
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:546
 #: src/gui/popupmenu.cpp:1857 src/gui/popupmenu.cpp:1953
 #: src/gui/popupmenu.cpp:2000
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:545
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:550
 #: src/gui/popupmenu.cpp:1861 src/gui/popupmenu.cpp:1918
 #: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:2004
 #: src/gui/skilldialog.cpp:242
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:641
+#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:646
 #: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1962
 #: src/gui/popupmenu.cpp:2009
 msgid "Drop..."
@@ -1064,7 +1064,7 @@ msgstr "Tirar..."
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:174 src/gui/outfitwindow.cpp:63
 #: src/gui/popupmenu.cpp:609
 msgid "Outfits"
 msgstr "Conjuntos"
@@ -1073,7 +1073,7 @@ msgstr "Conjuntos"
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:632
+#: src/gui/inventorywindow.cpp:201 src/gui/inventorywindow.cpp:637
 #: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1974
 #: src/gui/popupmenu.cpp:2021 src/gui/setup.cpp:74
 msgid "Store"
@@ -1083,9 +1083,9 @@ msgstr "Almacenar"
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:643 src/gui/popupmenu.cpp:1871
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1871
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2014
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "Drop"
 msgstr "Tirar"
 
@@ -1134,7 +1134,7 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:71
 msgid "Kill stats"
 msgstr "Estadísticas"
 
@@ -1249,7 +1249,7 @@ msgstr "Servidor:"
 #: src/gui/logindialog.cpp:129
 #, c-format
 msgid "Update host: %s"
-msgstr ""
+msgstr "Host de actualización: %s"
 
 #: src/gui/logindialog.cpp:145
 msgid "Custom update host"
@@ -1344,22 +1344,22 @@ msgstr "Enviar"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Fallo al enviar o mensaje inválido."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:553
+#: src/gui/outfitwindow.cpp:89 src/gui/outfitwindow.cpp:532
 #, c-format
 msgid "Outfit: %d"
 msgstr "Conjuntos: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:555
-#: src/gui/windowmenu.cpp:302
+#: src/gui/outfitwindow.cpp:91 src/gui/outfitwindow.cpp:534
+#: src/gui/windowmenu.cpp:311
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
 
-#: src/gui/outfitwindow.cpp:91
+#: src/gui/outfitwindow.cpp:94
 msgid "Unequip first"
 msgstr "Quitárselo antes"
 
-#: src/gui/outfitwindow.cpp:94
+#: src/gui/outfitwindow.cpp:97
 msgid "Away outfit"
 msgstr "Conjunto para modo AFK"
 
@@ -1562,13 +1562,13 @@ msgstr "Deformar"
 
 #: src/gui/popupmenu.cpp:595
 msgid "Move camera"
-msgstr ""
+msgstr "Mover cámara"
 
 #: src/gui/popupmenu.cpp:610
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
-#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:629 src/gui/windowmenu.cpp:98
 msgid "Spells"
 msgstr "Hechizos"
 
@@ -1817,7 +1817,7 @@ msgstr "requiere v%s"
 
 #: src/gui/setup_audio.cpp:45
 msgid "(no sound)"
-msgstr ""
+msgstr "(sin sonido)"
 
 #: src/gui/setup_audio.cpp:55
 msgid "Audio"
@@ -1825,7 +1825,7 @@ msgstr "Audio"
 
 #: src/gui/setup_audio.cpp:64
 msgid "Basic settings"
-msgstr ""
+msgstr "Configuraciones básicas"
 
 #: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
@@ -1853,39 +1853,39 @@ msgstr "Volumen de Música"
 
 #: src/gui/setup_audio.cpp:83
 msgid "Sound effects"
-msgstr ""
+msgstr "Efectos de sonido"
 
 #: src/gui/setup_audio.cpp:85
 msgid "Information dialog sound"
-msgstr ""
+msgstr "Sonido de diálogo de información"
 
 #: src/gui/setup_audio.cpp:88
 msgid "Request dialog sound"
-msgstr ""
+msgstr "Sonido de diálogo de petición"
 
 #: src/gui/setup_audio.cpp:91
 msgid "Whisper message sound"
-msgstr ""
+msgstr "Sonido de susurro"
 
 #: src/gui/setup_audio.cpp:94
 msgid "Guild / Party message sound"
-msgstr ""
+msgstr "Sonido de mensaje de Clan / Grupo"
 
 #: src/gui/setup_audio.cpp:97
 msgid "Highlight message sound"
-msgstr ""
+msgstr "Sonido de mensaje resaltado"
 
 #: src/gui/setup_audio.cpp:100
 msgid "Global message sound"
-msgstr ""
+msgstr "Sonido de mensaje global"
 
 #: src/gui/setup_audio.cpp:103
 msgid "Error message sound"
-msgstr ""
+msgstr "Sonido de mensaje de error"
 
 #: src/gui/setup_audio.cpp:106
 msgid "Trade request sound"
-msgstr ""
+msgstr "Sonido de petición de intercambio"
 
 #: src/gui/setup_audio.cpp:111
 msgid "Enable mumble voice chat"
@@ -1895,105 +1895,113 @@ msgstr "Habilitar el chat de voz de mumble"
 msgid "Download music"
 msgstr "Bajar Música"
 
-#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54
+msgid "Window"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Auto hide chat window."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Colores"
 
-#: src/gui/setup_chat.cpp:56
+#: src/gui/setup_chat.cpp:62
 msgid "Remove colors from received chat messages"
 msgstr "Remover los colores de los mensajes recibidos en el chat"
 
-#: src/gui/setup_chat.cpp:59
+#: src/gui/setup_chat.cpp:65
 msgid "Show chat colors list"
 msgstr "Mostrar lista de colores del chat"
 
-#: src/gui/setup_chat.cpp:63
+#: src/gui/setup_chat.cpp:69
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:71
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 "Permitir utilizar los comandos de magia y GM en todo tipo de ventana de "
 "diálogo"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:75
 msgid "Limits"
 msgstr "Límites"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:77
 msgid "Limit max chars in chat line"
 msgstr "Limitar máx. de caracteres en la línea de chat"
 
-#: src/gui/setup_chat.cpp:74
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max lines in chat"
 msgstr "Limitar líneas máx. en chat"
 
-#: src/gui/setup_chat.cpp:78
+#: src/gui/setup_chat.cpp:84
 msgid "Logs"
 msgstr "Registros"
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:86
 msgid "Enable chat Log"
 msgstr "Habilitar registro de chat"
 
-#: src/gui/setup_chat.cpp:83
+#: src/gui/setup_chat.cpp:89
 msgid "Show chat history"
 msgstr "Mostrar historial del chat"
 
-#: src/gui/setup_chat.cpp:87
+#: src/gui/setup_chat.cpp:93
 msgid "Messages"
 msgstr "Mensajes"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:95
 msgid "Hide shop messages"
 msgstr "Ocultar mensajes de la tienda"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:99
 msgid "Tabs"
 msgstr "Pestañas"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:101
 msgid "Put all whispers in tabs"
 msgstr "Mostrar nuevos susurros en pestañas"
 
-#: src/gui/setup_chat.cpp:98
+#: src/gui/setup_chat.cpp:104
 msgid "Log magic messages in debug tab"
 msgstr "Registrar mensajes de magia en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:107
 msgid "Show server messages in debug tab"
 msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:110
 msgid "Enable trade tab"
 msgstr "Habilitar pestaña de intercambio"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:113
 msgid "Enable battle tab"
 msgstr "Habilitar pestaña de batalla"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:116
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalla"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:119
 msgid "Resize chat tabs if need"
 msgstr "Si hace falta, cambia el tamaño de pestañas del chat"
 
-#: src/gui/setup_chat.cpp:117
+#: src/gui/setup_chat.cpp:123
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:125
 msgid "Use local time"
 msgstr "Usar hora local"
 
-#: src/gui/setup_chat.cpp:124
+#: src/gui/setup_chat.cpp:130
 msgid "Highlight words (separated by comma)"
 msgstr "Resaltar palabras (separadas por coma)"
 
-#: src/gui/setup_chat.cpp:127
+#: src/gui/setup_chat.cpp:133
 msgid "Show MVP messages"
 msgstr "Mostrar mensajes MVP"
 
@@ -2078,7 +2086,7 @@ msgstr "Parar"
 
 #: src/gui/setup_joystick.cpp:124
 msgid "Rotate the stick and don't press buttons"
-msgstr ""
+msgstr "Girar la palanca y no presionar los botones"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2252,35 +2260,43 @@ msgstr "Habilitar soporte para auction bot"
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Habilitar soporte de bot clan y deshabilitar soporte de clan nativo"
 
+#: src/gui/setup_other.cpp:165
+msgid "Windows"
+msgstr ""
+
 #: src/gui/setup_other.cpp:167
+msgid "Auto hide shortcuts buttons."
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
 msgid "Enable server side attack"
 msgstr "Habilitar el ataque del lado del servidor"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:175
 msgid "Enable bot checker"
 msgstr "Habilitar el control de bot"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:178
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activar la protección de servidores con errores (no deshabilitar)"
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:182
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:185
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:188
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite protector"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:192
 msgid "Use FBO for screenshots (only for opengl)"
-msgstr ""
+msgstr "Usar FBO para capturas de pantalla (sólo para opengl)"
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:196
 msgid "Show background"
 msgstr "Mostrar fondo"
 
@@ -2378,7 +2394,7 @@ msgstr "Permitir curarse a sí mismo con clic del ratón"
 
 #: src/gui/setup_players.cpp:86
 msgid "Group friends in who is online window"
-msgstr ""
+msgstr "Grupo de amigos en la ventana de conectados"
 
 #: src/gui/setup_relations.cpp:66
 msgid "Relation"
@@ -2651,23 +2667,23 @@ msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
 #: src/gui/setup_visual.cpp:35
 msgid "Visual"
-msgstr ""
+msgstr "Visual"
 
 #: src/gui/setup_visual.cpp:43
 msgid "Notifications"
-msgstr ""
+msgstr "Notificaciones"
 
 #: src/gui/setup_visual.cpp:45
 msgid "Show pickup notifications in chat"
-msgstr ""
+msgstr "Mostrar notificaciones en el chat al recoger"
 
 #: src/gui/setup_visual.cpp:48
 msgid "Show pickup notifications as particle effects"
-msgstr ""
+msgstr "Mostrar notificaciones como efecto de partículas al recoger"
 
 #: src/gui/setup_visual.cpp:51
 msgid "Effects"
-msgstr ""
+msgstr "Efectos"
 
 #: src/gui/setup_visual.cpp:53
 msgid "Grab mouse and keyboard input"
@@ -2731,15 +2747,15 @@ msgstr "Detalle de partículas"
 
 #: src/gui/setup_visual.cpp:88
 msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
 
 #: src/gui/setup_visual.cpp:94
 msgid "on"
-msgstr ""
+msgstr "on"
 
 #: src/gui/setup_visual.cpp:95
 msgid "Vsync"
-msgstr ""
+msgstr "Vsync"
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2775,7 +2791,7 @@ msgstr "Propuesta de intercambio"
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
 
-#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:230 src/gui/windowmenu.cpp:83
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -2914,7 +2930,7 @@ msgstr "Crear Clan"
 msgid "Create Party"
 msgstr "Crear grupo"
 
-#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:95
 msgid "Social"
 msgstr "Social"
 
@@ -3022,7 +3038,7 @@ msgstr "Nombre del grupo"
 msgid "Choose your party's name."
 msgstr "Escoge el nombre del grupo."
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:90
 msgid "Specials"
 msgstr "Especiales"
 
@@ -3404,7 +3420,7 @@ msgstr "Quienes están conectados - "
 msgid "Who Is Online - error"
 msgstr "Quienes están conectados - error"
 
-#: src/gui/whoisonline.cpp:669
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Quienes están conectados - Actualizar"
 
@@ -3583,83 +3599,83 @@ msgstr "Comando: /unignore <jugador>"
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando para de ignorar al jugador si está siendo ignorado."
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "BC"
 msgstr "BC"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:67
 msgid "Bot checker"
 msgstr "Control de robot"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "ONL"
 msgstr "ONL"
 
-#: src/gui/windowmenu.cpp:67
+#: src/gui/windowmenu.cpp:69
 msgid "Who is online"
 msgstr "Quién está conectado"
 
-#: src/gui/windowmenu.cpp:69
+#: src/gui/windowmenu.cpp:71
 msgid "KS"
 msgstr "KS"
 
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:73
 msgid "Smilies"
 msgstr "Emotíconos"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:75
 msgid "Status"
 msgstr "Estado"
 
-#: src/gui/windowmenu.cpp:74
+#: src/gui/windowmenu.cpp:76
 msgid "EQU"
 msgstr "EQU"
 
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:78
 msgid "INV"
 msgstr "INV"
 
-#: src/gui/windowmenu.cpp:81
+#: src/gui/windowmenu.cpp:83
 msgid "SKI"
 msgstr "SKI"
 
-#: src/gui/windowmenu.cpp:88
+#: src/gui/windowmenu.cpp:90
 msgid "SPE"
 msgstr "SPE"
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:95
 msgid "SOC"
 msgstr "SOC"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "SH"
 msgstr "SH"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:96
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:98
 msgid "SP"
 msgstr "SP"
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:99
 msgid "DR"
 msgstr "DR"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "YK"
 msgstr "YK"
 
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:100
 msgid "Did you know"
 msgstr "¿Sabías que..."
 
-#: src/gui/windowmenu.cpp:100
+#: src/gui/windowmenu.cpp:102
 msgid "SET"
 msgstr "SET"
 
@@ -3683,449 +3699,437 @@ msgstr "Almacenamiento"
 msgid "Cart"
 msgstr "Mochila"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:72 src/keyboarddata.h:497 src/keyboarddata.h:503
+#: src/keyboarddata.h:509 src/keyboarddata.h:515 src/keyboarddata.h:521
+#: src/keyboarddata.h:527 src/keyboarddata.h:533 src/keyboarddata.h:539
+#: src/keyboarddata.h:545 src/keyboarddata.h:551 src/keyboarddata.h:557
+#: src/keyboarddata.h:563 src/keyboarddata.h:569 src/keyboarddata.h:575
+#: src/keyboarddata.h:581 src/keyboarddata.h:587 src/keyboarddata.h:593
+#: src/keyboarddata.h:599 src/keyboarddata.h:605 src/keyboarddata.h:611
+#: src/keyboarddata.h:617 src/keyboarddata.h:623 src/keyboarddata.h:629
+#: src/keyboarddata.h:635 src/keyboarddata.h:641 src/keyboarddata.h:647
+#: src/keyboarddata.h:653 src/keyboarddata.h:659 src/keyboarddata.h:665
+#: src/keyboarddata.h:671 src/keyboarddata.h:677 src/keyboarddata.h:683
+#: src/keyboarddata.h:689 src/keyboarddata.h:695 src/keyboarddata.h:701
+#: src/keyboarddata.h:707 src/keyboarddata.h:713 src/keyboarddata.h:719
+#: src/keyboarddata.h:725 src/keyboarddata.h:731 src/keyboarddata.h:737
+#: src/keyboarddata.h:743 src/keyboarddata.h:749 src/keyboarddata.h:755
+#: src/keyboarddata.h:761 src/keyboarddata.h:767 src/keyboarddata.h:773
+#: src/keyboarddata.h:779
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Atajo para Emoticono %d"
+
+#: src/keyboardconfig.cpp:77 src/keyboarddata.h:227 src/keyboarddata.h:233
+#: src/keyboarddata.h:239 src/keyboarddata.h:245 src/keyboarddata.h:251
+#: src/keyboarddata.h:257 src/keyboarddata.h:263 src/keyboarddata.h:269
+#: src/keyboarddata.h:275 src/keyboarddata.h:281 src/keyboarddata.h:287
+#: src/keyboarddata.h:293 src/keyboarddata.h:299 src/keyboarddata.h:305
+#: src/keyboarddata.h:311 src/keyboarddata.h:317 src/keyboarddata.h:323
+#: src/keyboarddata.h:329 src/keyboarddata.h:335 src/keyboarddata.h:341
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Atajo para el objeto %d"
+
+#: src/keyboardconfig.cpp:138
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
+"puede presentar un comportamiento raro."
+
+#: src/keyboardconfig.cpp:201
+#, c-format
+msgid "key_%d"
+msgstr "tecla_%d"
+
+#: src/keyboardconfig.cpp:203
+msgid "unknown key"
+msgstr "tecla desconocida"
+
+#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
+#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:234
+msgid "u key"
+msgstr "tecla u"
+
+#: src/keyboarddata.h:52
 msgid "Basic Keys"
 msgstr "Teclas Básicas"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboarddata.h:58
 msgid "Move Up"
 msgstr "Mover para arriba"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboarddata.h:64
 msgid "Move Down"
 msgstr "Mover para abajo"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboarddata.h:70
 msgid "Move Left"
 msgstr "Izquierda"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboarddata.h:76
 msgid "Move Right"
 msgstr "Derecha"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboarddata.h:88
 msgid "Target & Attack"
 msgstr "Seleccionar & Atacar"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboarddata.h:94
 msgid "Move to Target"
 msgstr "Mover al objetivo"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboarddata.h:100
 msgid "Change Move to Target type"
 msgstr "Cambiar Movimiento al tipo de Objetivo"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboarddata.h:106
 msgid "Move to Home location"
 msgstr "Mover hacia la localización Inicial"
 
-#: src/keyboardconfig.cpp:62
+#: src/keyboarddata.h:112
 msgid "Set home location"
 msgstr "Estableces la localización Inicial"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboarddata.h:118
 msgid "Move to navigation point"
 msgstr "Mover al punto de navegación"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboarddata.h:130
 msgid "Stop Attack"
 msgstr "Dejar de atacar"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboarddata.h:136
 msgid "Untarget"
 msgstr "Sin seleccionar"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboarddata.h:142
 msgid "Target Closest"
 msgstr "Apuntar al más cercano"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboarddata.h:148
 msgid "Target NPC"
 msgstr "Seleccionar NPC"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboarddata.h:154
 msgid "Target Player"
 msgstr "Seleccionar Jugador"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboarddata.h:160
 msgid "Pickup"
 msgstr "Coger"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboarddata.h:166
 msgid "Change Pickup Type"
 msgstr "Cambiar el tipo de recogida"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboarddata.h:172
 msgid "Hide Windows"
 msgstr "Esconder ventanas"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboarddata.h:178
 msgid "Sit"
 msgstr "Sentarse"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboarddata.h:184
 msgid "Screenshot"
 msgstr "Imprimir pantalla"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboarddata.h:190
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Deshabilitar Intercambios"
 
-#: src/keyboardconfig.cpp:84
+#: src/keyboarddata.h:196
 msgid "Change Map View Mode"
 msgstr "Cambiar el tipo de vista del mapa"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboarddata.h:202
 msgid "Select OK"
 msgstr "Seleccionar OK"
 
-#: src/keyboardconfig.cpp:89
+#: src/keyboarddata.h:215
 msgid "Shortcuts Keys"
 msgstr "Teclas de Atajos"
 
-#: src/keyboardconfig.cpp:90
+#: src/keyboarddata.h:221
 msgid "Item Shortcuts Key"
 msgstr "Tecla de acceso directo de objeto"
 
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:118
-#: src/keyboardconfig.cpp:120 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:129 src/keyboardconfig.cpp:131
-#: src/keyboardconfig.cpp:383
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Atajo para el objeto %d"
-
-#: src/keyboardconfig.cpp:132
+#: src/keyboarddata.h:347
 msgid "Windows Keys"
 msgstr "Teclas de Ventanas"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboarddata.h:353
 msgid "Help Window"
 msgstr "Ventana de ayuda"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboarddata.h:359
 msgid "Status Window"
 msgstr "Ventana de Estado"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboarddata.h:365
 msgid "Inventory Window"
 msgstr "Ventana de inventario"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboarddata.h:371
 msgid "Equipment Window"
 msgstr "Ventana de equipamiento"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboarddata.h:377
 msgid "Skill Window"
 msgstr "Ventana de habilidades"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboarddata.h:383
 msgid "Minimap Window"
 msgstr "Ventana del Mini-mapa"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboarddata.h:389
 msgid "Chat Window"
 msgstr "Ventana de Chat"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboarddata.h:395
 msgid "Item Shortcut Window"
 msgstr "Ventana de atajos para objetos"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboarddata.h:401
 msgid "Setup Window"
 msgstr "Ventana de Configuración"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboarddata.h:407
 msgid "Debug Window"
 msgstr "Ventana de Depurador"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboarddata.h:413
 msgid "Social Window"
 msgstr "Ventana Social"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboarddata.h:419
 msgid "Emote Shortcut Window"
 msgstr "Ventana de Emoticonos"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboarddata.h:425
 msgid "Outfits Window"
 msgstr "Ventana de Conjuntos"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboarddata.h:431
 msgid "Shop Window"
 msgstr "Ventana de la tienda"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboarddata.h:437
 msgid "Quick drop Window"
 msgstr "Ventana de lanzamiento de objetos"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboarddata.h:443
 msgid "Kill Stats Window"
 msgstr "Ventana de Estadísticas"
 
-#: src/keyboardconfig.cpp:165
+#: src/keyboarddata.h:449
 msgid "Commands Window"
 msgstr "Ventana de comandos"
 
-#: src/keyboardconfig.cpp:167
+#: src/keyboarddata.h:455
 msgid "Bot Checker Window"
 msgstr "Ventana de Chequeo de Bot"
 
-#: src/keyboardconfig.cpp:170
+#: src/keyboarddata.h:461
 msgid "Who Is Online Window"
 msgstr "Ventana de Jugadores Conectados"
 
-#: src/keyboardconfig.cpp:172
+#: src/keyboarddata.h:467
 msgid "Did you know Window"
 msgstr "Ventana ¿Sabías que.."
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboarddata.h:473
 msgid "Previous Social Tab"
 msgstr "Pestaña Social Previa"
 
-#: src/keyboardconfig.cpp:177
+#: src/keyboarddata.h:479
 msgid "Next Social Tab"
 msgstr "Pestaña Social Siguiente"
 
-#: src/keyboardconfig.cpp:179
+#: src/keyboarddata.h:485
 msgid "Emotes Keys"
 msgstr "Teclas de Emoticonos"
 
-#: src/keyboardconfig.cpp:180
+#: src/keyboarddata.h:491
 msgid "Smilie"
 msgstr "Emoticono"
 
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:233
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:278 src/keyboardconfig.cpp:280
-#: src/keyboardconfig.cpp:378
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Atajo para Emoticono %d"
-
-#: src/keyboardconfig.cpp:282
+#: src/keyboarddata.h:785
 msgid "Outfits Keys"
 msgstr "Teclas de Conjuntos"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboarddata.h:790
 msgid "Wear Outfit"
 msgstr "Ponerse el conjunto"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboarddata.h:793
 msgid "Copy Outfit"
 msgstr "Copiar el conjunto"
 
-#: src/keyboardconfig.cpp:287
+#: src/keyboarddata.h:797
 msgid "Copy equipped to Outfit"
 msgstr "Copiar lo que tiene equipado a Conjunto"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboarddata.h:802
 msgid "Chat Keys"
 msgstr "Teclas del Chat"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboarddata.h:805
 msgid "Toggle Chat"
 msgstr "Cambiar Chat"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboarddata.h:811
 msgid "Scroll Chat Up"
 msgstr "Desplazarse hacia arriba en el chat"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboarddata.h:817
 msgid "Scroll Chat Down"
 msgstr "Desplazarse hacia abajo en el chat"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboarddata.h:823
 msgid "Previous Chat Tab"
 msgstr "Pestaña de Chat Anterior"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboarddata.h:829
 msgid "Next Chat Tab"
 msgstr "Siguiente Pestaña del Chat"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboarddata.h:835
 msgid "Close current Chat Tab"
 msgstr "Cerrar la Pestaña activa del Chat"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboarddata.h:840
 msgid "Previous chat line"
 msgstr "Línea previa del chat"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboarddata.h:843
 msgid "Next chat line"
 msgstr "Siguiente línea del chat"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboarddata.h:846
 msgid "Chat Auto Complete"
 msgstr "Completar texto automáticamente en chat"
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboarddata.h:849
 msgid "Deactivate Chat Input"
 msgstr "Desactivar entrada al Chat"
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboarddata.h:852
 msgid "Other Keys"
 msgstr "Otras Teclas"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboarddata.h:855
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboarddata.h:861
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboarddata.h:867
 msgid "Direct Up"
 msgstr "Arriba"
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboarddata.h:873
 msgid "Direct Down"
 msgstr "Abajo"
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboarddata.h:879
 msgid "Direct Left"
 msgstr "Izquierda"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboarddata.h:885
 msgid "Direct Right"
 msgstr "Derecha"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboarddata.h:891
 msgid "Crazy moves"
 msgstr "Movimientos locos"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboarddata.h:897
 msgid "Change Crazy Move mode"
 msgstr "Cambiar  el tipo de movimientos locos"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboarddata.h:903
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Lanzamiento de N objetos desde 0 casillas"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboarddata.h:909
 msgid "Quick Drop N Items"
 msgstr "Dejar caer N artículos rápidamente"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboarddata.h:915
 msgid "Switch Quick Drop Counter"
 msgstr "Cambiar el contador de lanzamientos"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboarddata.h:921
 msgid "Quick heal target or self"
 msgstr "Curar rápidamente a objetivo o a sí mismo"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboarddata.h:927
 msgid "Use #itenplz spell"
 msgstr "Usar el hechizo #itenplz"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboarddata.h:933
 msgid "Use magic attack"
 msgstr "Usar ataque mágico"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboarddata.h:939
 msgid "Switch magic attack"
 msgstr "Intercambiar ataque mágico"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboarddata.h:945
 msgid "Switch pvp attack"
 msgstr "Intercambiar ataque pvp"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboarddata.h:951
 msgid "Change move type"
 msgstr "Cambiar tipo de maniobra"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboarddata.h:957
 msgid "Change Attack Weapon Type"
 msgstr "Cambiar tipo de arma de ataque"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboarddata.h:963
 msgid "Change Attack Type"
 msgstr "Cambiar tipo de ataque"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboarddata.h:969
 msgid "Change Follow mode"
 msgstr "Cambiar modo de perseguir"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboarddata.h:975
 msgid "Change Imitation mode"
 msgstr "Cambiar modo de Imitación"
 
-#: src/keyboardconfig.cpp:353
+#: src/keyboarddata.h:981
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Deshabilitar las teclas de modificación del Juego"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboarddata.h:987
 msgid "On / Off audio"
 msgstr "Encender / Apagar audio"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboarddata.h:993
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Deshabilitar modo AFK"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboarddata.h:999
 msgid "Emulate right click from keyboard"
 msgstr "Emular clic derecho desde el teclado"
 
-#: src/keyboardconfig.cpp:360
+#: src/keyboarddata.h:1005
 msgid "Toggle camera mode"
 msgstr "Interruptor de tipo de cámara"
 
-#: src/keyboardconfig.cpp:362
+#: src/keyboarddata.h:1011
 msgid "Modifier key"
 msgstr "Tecla modificadora"
 
-#: src/keyboardconfig.cpp:443
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
-"puede presentar un comportamiento raro."
-
-#: src/keyboardconfig.cpp:518
-#, c-format
-msgid "key_%d"
-msgstr ""
-
-#: src/keyboardconfig.cpp:520
-msgid "unknown key"
-msgstr ""
-
-#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/keyboardconfig.cpp:538 src/keyboardconfig.cpp:551
-msgid "u key"
-msgstr ""
-
 #: src/localplayer.cpp:376
 #, c-format
 msgid "You were killed by %s"
@@ -4391,7 +4395,7 @@ msgstr "(b) atacar a quienes están en malas relaciones"
 
 #: src/localplayer.cpp:2151
 msgid "(d) don't attack players"
-msgstr ""
+msgstr "(d) no atacar a los jugadores"
 
 #: src/localplayer.cpp:2152
 msgid "(?) pvp attack"