Rebuild translations and update ru translation.

1 files changed, 186 insertions, 178 deletions

diff --git a/po/es.po b/po/es.po
index a19942550..528ba58fe 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
@@ -12,80 +12,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"manaplus/team/es/)\n"
-"Language: es\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/manaplus/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Rendimiento"
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +94,50 @@ msgstr "Cambiando servidores del juego"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, 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:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, 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."
@@ -154,8 +153,8 @@ msgstr "¡No puedes enviar susurros vacíos!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
@@ -239,7 +238,7 @@ msgstr "en la lista negra"
 
 #: src/commandhandler.cpp:594
 msgid "enemy"
-msgstr ""
+msgstr "enemigo"
 
 #: src/commandhandler.cpp:609
 msgid "Player already erased!"
@@ -320,8 +319,7 @@ msgstr "Imágenes de recurso huérfano:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
+msgstr "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -331,35 +329,35 @@ msgstr "General"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -437,7 +435,7 @@ msgstr "Cantidad:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -445,7 +443,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -457,8 +455,8 @@ msgid "Quit"
 msgstr "Salir"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Máximo"
 
@@ -732,10 +730,11 @@ msgstr "arco iris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1347,7 +1346,7 @@ msgstr "Lista negra"
 #: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
 #: src/gui/popupmenu.cpp:666
 msgid "Set as enemy"
-msgstr ""
+msgstr "Establecer como enemigo"
 
 #: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
@@ -1375,7 +1374,7 @@ msgstr "Des-ignorar"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1630,13 +1629,13 @@ msgstr "Mostrar"
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1959,29 +1958,33 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Presiona el botón para empezar la calibración"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Gira el stick"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2165,7 +2168,7 @@ msgstr "Habilitar el control de robot"
 
 #: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+msgstr "Activar la protección de servidores con errores (no deshabilitar)"
 
 #: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
@@ -2309,7 +2312,7 @@ msgstr "En la lista negra"
 
 #: src/gui/setup_relations.cpp:76
 msgid "Enemy"
-msgstr ""
+msgstr "Enemigo"
 
 #: src/gui/setup_relations.cpp:240
 msgid "Allow trading"
@@ -2357,55 +2360,55 @@ msgstr "Enorme (15)"
 
 #: src/gui/setup_theme.cpp:146
 msgid "Chinese (China)"
-msgstr ""
+msgstr "Chino (China)"
 
 #: src/gui/setup_theme.cpp:147
 msgid "Czech"
-msgstr ""
+msgstr "Checo"
 
 #: src/gui/setup_theme.cpp:148
 msgid "English"
-msgstr ""
+msgstr "Inglés"
 
 #: src/gui/setup_theme.cpp:149
 msgid "Finnish"
-msgstr ""
+msgstr "Finlandés"
 
 #: src/gui/setup_theme.cpp:150
 msgid "French"
-msgstr ""
+msgstr "Francés"
 
 #: src/gui/setup_theme.cpp:151
 msgid "German"
-msgstr ""
+msgstr "Alemán"
 
 #: src/gui/setup_theme.cpp:152
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonesio"
 
 #: src/gui/setup_theme.cpp:153
 msgid "Japanese"
-msgstr ""
+msgstr "Japonés"
 
 #: src/gui/setup_theme.cpp:154
 msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+msgstr "Holanda (Bélgica/Flandes)"
 
 #: src/gui/setup_theme.cpp:155
 msgid "Portuguese"
-msgstr ""
+msgstr "Portugués"
 
 #: src/gui/setup_theme.cpp:156
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Portugués (Brasileño)"
 
 #: src/gui/setup_theme.cpp:157
 msgid "Russian"
-msgstr ""
+msgstr "Ruso"
 
 #: src/gui/setup_theme.cpp:158
 msgid "Spanish (Castilian)"
-msgstr ""
+msgstr "Español (Castellano)"
 
 #: src/gui/setup_theme.cpp:190
 msgid "Theme"
@@ -2417,7 +2420,7 @@ msgstr "Tema de interfáz gráfica"
 
 #: src/gui/setup_theme.cpp:193
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #: src/gui/setup_theme.cpp:194
 msgid "Main Font"
@@ -3083,23 +3086,23 @@ msgstr "(?) ataque mágico"
 
 #: src/gui/statuspopup.cpp:489
 msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) atacar a todos los jugadores"
 
 #: src/gui/statuspopup.cpp:493
 msgid "(f) attack not friends"
-msgstr ""
+msgstr "(f) atacar a los que no son amigos"
 
 #: src/gui/statuspopup.cpp:497
 msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) atacar a quienes están en malas relaciones"
 
 #: src/gui/statuspopup.cpp:501
 msgid "(d) dont attack players"
-msgstr ""
+msgstr "(d) no atacar a los jugadores"
 
 #: src/gui/statuspopup.cpp:505
 msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) ataque pvp"
 
 #: src/gui/statuspopup.cpp:514
 msgid "(D) default imitation"
@@ -3145,181 +3148,181 @@ msgstr "Modificadores del juego están deshabilitados"
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "PV:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "PM:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Trabajo: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Trabajo:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr "Puntos del personaje: %d"
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivel: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr "Puntos de corrección: %d"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3449,7 +3452,8 @@ msgid "You don't have enough money."
 msgstr "No tienes dinero suficiente."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
@@ -3471,21 +3475,21 @@ msgstr "Conectando..."
 msgid "Play"
 msgstr "Jugar"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1  El proceso de actualización esta incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr "##1 lo intentes de nuevo más tarde."
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Completado"
 
@@ -3833,7 +3837,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jugador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+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
@@ -4308,7 +4313,7 @@ msgstr "Intercambiar ataque mágico"
 
 #: src/keyboardconfig.cpp:329
 msgid "Switch pvp attack"
-msgstr ""
+msgstr "Intercambiar ataque pvp"
 
 #: src/keyboardconfig.cpp:330
 msgid "Change move type"
@@ -4363,68 +4368,68 @@ msgstr ""
 "Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
 msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr "Ves "
 
@@ -4818,8 +4823,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<política> puede ser \"1\", \"yes\" y \"true\" para compartir experiencia, o "
-"\"0\", \"no\" y \"false\" para no compartir."
+"<política> puede ser \"1\", \"yes\" y \"true\" para compartir experiencia, o"
+" \"0\", \"no\" y \"false\" para no compartir."
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4910,8 +4915,8 @@ msgstr "Rechazado del servidor."
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
-"GM."
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo"
+" GM."
 
 #: src/net/ea/loginhandler.cpp:219
 msgid "Client too old."
@@ -5118,7 +5123,8 @@ msgstr "Mensaje"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
 #: src/net/ea/playerhandler.cpp:346
@@ -5699,15 +5705,15 @@ msgstr "Alcance de Ataque"
 msgid "Damage per sec."
 msgstr "Daño por segundo."
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr "Adress vacía enviada a Network::connect()!"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr "No es posible determinar el host \""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr "Conexión al servidor terminada."
 
@@ -5716,19 +5722,19 @@ msgstr "Conexión al servidor terminada."
 msgid "%s is not in your party!"
 msgstr "%s no está en tu grupo!"
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr "Parpadear nombre"
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr "Burbuja '...' flotante"
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr "Burbuja Flotante"
 
@@ -5760,3 +5766,5 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Objeto desconocido"
+
+