Rebuild and update translations.

13 files changed, 1731 insertions, 5226 deletions

diff --git a/po/de.po b/po/de.po
index a144c93a4..301b721c5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -42,35 +42,35 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -79,50 +79,50 @@ msgstr ""
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr "Fordere Registrierungsdetails an"
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr "Passwort ändern:"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/client.cpp:1628
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Unbekannter Update-Rechner: %s"
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -300,43 +300,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Allgemein"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -458,7 +458,7 @@ msgstr "Verkaufen"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -981,7 +981,7 @@ msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "Einlagern"
 
@@ -1871,11 +1871,11 @@ msgstr "Blau: "
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "Anwenden"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
@@ -2086,6 +2086,10 @@ msgstr ""
 msgid "Hide shield sprite"
 msgstr ""
 
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Beziehung"
@@ -2227,8 +2231,8 @@ msgstr "Schriftgröße"
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
 
@@ -2280,134 +2284,138 @@ msgstr "Mittel"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "Benachrichtigung beim Aufheben"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "im Chatfenster"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "als Partikeleffekt"
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 msgid "Enable opacity cache"
 msgstr ""
 
-#: src/gui/setup_video.cpp:305
+#: src/gui/setup_video.cpp:306
 msgid "Enable map reduce"
 msgstr ""
 
-#: src/gui/setup_video.cpp:307
-msgid "Show background"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "Chat über Spielern"
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
 "anzupassen."
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
diff --git a/po/es.po b/po/es.po
index 6b45aee21..4077b9e44 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.
-#
+# 
 # Nelson  <nelson6eeduardo65@gmail.com>, 2011.
 # Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011.
 # Nelson Martell <nelson6eeduardo65@gmail.com>, 2011.
@@ -11,15 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
-"PO-Revision-Date: 2011-08-02 20:57+0000\n"
-"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"manaplus/team/es/)\n"
-"Language: es\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"PO-Revision-Date: 2011-08-08 01:29+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\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:1034
@@ -44,35 +43,35 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr "Cargando jugadores"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -81,50 +80,50 @@ msgstr "Cambiando servidores del juego"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, 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:1628
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de actualización inválido: %s"
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "¡Error creando la carpeta de actualizaciones!"
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, 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."
@@ -140,8 +139,8 @@ msgstr "¡No puedes enviar susurros vacíos!"
 #: src/commandhandler.cpp:409
 #, 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ú."
@@ -298,46 +297,45 @@ 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:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con elservidor."
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -459,7 +457,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -839,7 +837,7 @@ msgstr "Grupo de destino:"
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
 #: src/gui/debugwindow.cpp:347
 msgid "Target Guild:"
-msgstr "Diana de Guild:"
+msgstr "Gremio objetivo:"
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
@@ -982,7 +980,7 @@ msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "Almacenar"
 
@@ -1868,11 +1866,11 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
@@ -2081,6 +2079,10 @@ msgstr "Modo de bajo tráfico"
 msgid "Hide shield sprite"
 msgstr "Ocultar los objetos escudos"
 
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr "Mostrar fondo"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relación"
@@ -2221,8 +2223,8 @@ msgstr "Tamaño de fuente"
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie el juego para que los cambios tengan efecto."
 
@@ -2274,133 +2276,137 @@ msgstr "medio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Hw acceleration"
 msgstr "Aceleración de hardware"
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "Efectos de partículas"
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "Mostrar aviso al coger algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "en chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 msgid "Enable opacity cache"
 msgstr "Habilitar caché de opacidad"
 
-#: src/gui/setup_video.cpp:305
+#: src/gui/setup_video.cpp:306
 msgid "Enable map reduce"
 msgstr "Habilitar reducción del mapa"
 
-#: src/gui/setup_video.cpp:307
-msgid "Show background"
-msgstr "Mostrar fondo"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 msgid "Alt FPS limit: "
 msgstr "Limites alternativas FPS: "
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "Sobrecarga de texto"
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "Opacidad de interfaz"
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
 msgstr "Detalle de partículas"
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
 msgstr "Nada"
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Fallo al cambiar para el modo ventana y fallo al restaurar el modo anterior!"
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Fallo al cambiar para el modo ventana completa y fallo al restaurar el modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:                "
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
 msgstr "Configuración del efecto de las partículas cambiado."
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "Los cambios tendran efecto cuando se cambie de mapa."
 
@@ -2473,35 +2479,35 @@ msgstr "Nivel: %d (%+d)"
 
 #: src/gui/socialwindow.cpp:117
 msgid "Guild"
-msgstr "Clan"
+msgstr "gremio"
 
 #: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr "Invita al jugador %s para su clan %s."
+msgstr "Invita al jugador %s para su gremio %s."
 
 #: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
-msgstr "Clan %s pidiendo salir."
+msgstr "Gremio %s pidiendo salir."
 
 #: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
-msgstr "Miembro invitado al clan."
+msgstr "Miembro invitado al Gremio."
 
 #: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr "A quién te gustaría invitar al clan %s?"
+msgstr "A quién te gustaría invitar al gremio %s?"
 
 #: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
-msgstr "Salir del clan?"
+msgstr "¿Dejar el Gremio?"
 
 #: src/gui/socialwindow.cpp:198
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Estás seguro de dejar el clan %s?"
+msgstr "¿Estás seguro de que quieres dejar el gremio %s?"
 
 #: src/gui/socialwindow.cpp:215
 msgid "Party"
@@ -2549,15 +2555,15 @@ msgstr "Pandillas prioritarias"
 
 #: src/gui/socialwindow.cpp:872
 msgid "Attack mobs"
-msgstr "Ataques de las pandillas"
+msgstr "Pandillas para atacar"
 
 #: src/gui/socialwindow.cpp:907
 msgid "Ignore mobs"
-msgstr "Ignorar pandillas"
+msgstr "Pandillas ignoradas"
 
 #: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
-msgstr "Crear clan"
+msgstr "Crear Gremio"
 
 #: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
@@ -2584,17 +2590,17 @@ msgstr "Cancelada la invitación de %s."
 #: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Aceptada la invitación a la guild de  %s."
+msgstr "Aceptada la invitación al gremio de  %s."
 
 #: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Cancelada la invitación a la guild de %s."
+msgstr "Rechazada la invitación al gremio de %s."
 
 #: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
-msgstr "Creando clan llamado %s."
+msgstr "Creando gremio llamado %s."
 
 #: src/gui/socialwindow.cpp:1280
 #, c-format
@@ -2603,24 +2609,24 @@ msgstr "Creando grupo llamado %s."
 
 #: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
-msgstr "Nombre del clan"
+msgstr "Nombre del Gremio"
 
 #: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
-msgstr "Escoja el nombre de su clan."
+msgstr "Escoja el nombre de su gremio."
 
 #: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
-msgstr "Recibida petición de creación del clan, pero ya existe."
+msgstr "Recibida petición de creación del gremio, pero ya existe."
 
 #: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s te ha invitado al clan %s."
+msgstr "%s te ha invitado al gremio %s."
 
 #: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
-msgstr "Aceptar invitación al clan"
+msgstr "Aceptar invitación al gremio"
 
 #: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
@@ -3198,7 +3204,8 @@ msgid "Change"
 msgstr "Cambiar"
 
 #: src/gui/tradewindow.cpp:332
-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."
@@ -3292,7 +3299,7 @@ msgstr "Miembros del grupo"
 
 #: src/gui/userpalette.cpp:130
 msgid "Guild Members"
-msgstr "Miembros del guild"
+msgstr "Miembros del Gremio"
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3494,7 +3501,7 @@ msgstr "Se necesita un usuario para ser operador!"
 
 #: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
-msgstr "Se necesita un usuario a expulsar!"
+msgstr "¡Se necesita un usuario a expulsar!"
 
 #: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
@@ -3545,7 +3552,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 había sido ignorado."
 
 #: src/gui/windowmenu.cpp:65
@@ -4453,11 +4461,11 @@ msgstr "Evento de canal desconocido."
 
 #: src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
-msgstr "Clan creado."
+msgstr "Gremio creado."
 
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
-msgstr "Error al crear el clan."
+msgstr "Error al crear el gremio."
 
 #: src/net/manaserv/guildhandler.cpp:100
 msgid "Invite sent."
@@ -4777,495 +4785,4 @@ msgstr "PM %+d"
 msgid "Unknown item"
 msgstr "Objeto desconocido"
 
-#~ msgid ""
-#~ "Access denied. Most likely, there are too many players on this server."
-#~ msgstr "Acesso denegado.Probablemente es que alla muchos jugadores."
-
-#~ msgid "Cannot use this ID."
-#~ msgstr "Imposible usar esta ID."
-
-#~ msgid "Unknown char-server failure."
-#~ msgstr "Error desconocido del char-server."
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr "Error al crear personaje. Probablemente ya esté en uso."
-
-#~ msgid "Wrong name."
-#~ msgstr "Nombre equivocado."
-
-#~ msgid "Incorrect stats."
-#~ msgstr "Estadísticas incorrectas."
-
-#~ msgid "Incorrect hair."
-#~ msgstr "Cabello incorecto."
-
-#~ msgid "Incorrect slot."
-#~ msgstr "Ranura incorrecta."
-
-#~ msgid "Character deleted."
-#~ msgstr "Personaje Borrado."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Fallo al borrar el personaje."
-
-#~ msgid "Strength:"
-#~ msgstr "Fuerza:"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilidad:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalidad:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligencia:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Destreza:"
-
-#~ msgid "Luck:"
-#~ msgstr "Suerte:"
-
-#~ msgid "Whisper could not be sent, %s is offline."
-#~ msgstr "No pudo ser enviado el Susurro, ya que %s está desconectado."
-
-#~ msgid "Whisper could not be sent, ignored by %s."
-#~ msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
-
-#~ msgid "MVP player."
-#~ msgstr "Jugador VIP."
-
-#~ msgid "MVP player: "
-#~ msgstr "Jugador MVP: "
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Canales no son soportados!"
-
-#~ msgid "Online users: %d"
-#~ msgstr "Jugadores online: %d"
-
-#~ msgid "Game"
-#~ msgstr "Juego"
-
-#~ msgid "Request to quit denied!"
-#~ msgstr "Petición de salida denegada!"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Para la ayuda."
-
-#~ msgid "/invite > Invite a player to your guild"
-#~ msgstr "/invite > Invita un jugador a tu clan"
-
-#~ msgid "/leave > Leave the guild you are in"
-#~ msgstr "/leave > Deja el clan en la que estas"
-
-#~ msgid "/kick > Kick some one from the guild you are in"
-#~ msgstr "/kick > Expulsa a alguien del clan en el que estás."
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Comando: /invite <nick>"
-
-#~ msgid "This command invites <nick> to the guild you're in."
-#~ msgstr "Este comando invita a <nick> para el clan en el que estás ."
-
-#~ msgid "Command: /leave"
-#~ msgstr "Comando: /leave"
-
-#~ msgid "This command causes the player to leave the guild."
-#~ msgstr "Este comando hace que dejes el clan."
-
-#~ msgid "You are already in guild."
-#~ msgstr "Ya estás en el gremio."
-
-#~ msgid "Emperium check failed."
-#~ msgstr "La verificación de la guild no se effectuó."
-
-#~ msgid "Unknown server response."
-#~ msgstr "Respuesta del servidor desconocida."
-
-#~ msgid "Guild name: %s"
-#~ msgstr "Nombre del gremio: %s"
-
-#~ msgid "Guild master: %s"
-#~ msgstr "Maestro del gremio: %s"
-
-#~ msgid "Guild level: %d"
-#~ msgstr "Nivel en gremio: %d"
-
-#~ msgid "Online members: %d"
-#~ msgstr "Miembros conectados: %d"
-
-#~ msgid "Max members: %d"
-#~ msgstr "Máx. Miembros: %d"
-
-#~ msgid "Average level: %d"
-#~ msgstr "Nivel promedio: %d"
-
-#~ msgid "Guild exp: %d"
-#~ msgstr "Experiencia del gremio: %d"
-
-#~ msgid "Guild next exp: %d"
-#~ msgstr "Experiencia siguiente del gremio: %d"
-
-#~ msgid "Guild castle: %s"
-#~ msgstr "Castillo del gremio: %s"
-
-#~ msgid "Could not inivte user to guild."
-#~ msgstr "No se puede invitar jugadores al clan."
-
-#~ msgid "User rejected guild invite."
-#~ msgstr "El jugador cancel la invitacion a tu guild."
-
-#~ msgid "User is now part of your guild."
-#~ msgstr "El usuario es ahora de tu clan."
-
-#~ msgid "Your guild is full."
-#~ msgstr "Tu clan está lleno."
-
-#~ msgid "Unknown guild invite response."
-#~ msgstr "Invitación desconocida a una guild."
-
-#~ msgid "You have left the guild."
-#~ msgstr "Has dejado el gremio."
-
-#~ msgid "%s has left your guild."
-#~ msgstr "%s ha dejado tu gremio."
-
-#~ msgid "You was kicked from guild."
-#~ msgstr "Usted fue expulsado del gremio."
-
-#~ msgid "%s has kicked from your guild."
-#~ msgstr "%s saco alguien de tu gremio."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Invita un jugador a tu grupo"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Dejar el grupo en el que estás"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Expulsa a alguien del grupo en el que estás"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr "/item > Mostrar/Cambiar el compartir objetos en el grupo"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr "/exp > Mostrar/Cambiar el compartir experiencia en el grupo "
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Este comando invita al jugador <nick> a formar parte de tu grupo."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Este comando hace que dejes el grupo."
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Comando> /item <política>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr ""
-#~ "Este comando cambia la política de compartición de artículos en el grupo."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, "
-#~ "or \"0\", \"no\", \"false\" to disable item sharing."
-#~ msgstr ""
-#~ "<política> puede ser \"1\", \"yes\" y \"true\" para compartir artículos, "
-#~ "o \"0\", \"no\" y \"false\" para no compartirlos."
-
-#~ msgid "Command: /item"
-#~ msgstr "Comando: /item"
-
-#~ msgid "This command displays the party's current item sharing policy."
-#~ msgstr ""
-#~ "Este comando muestra la política actual de compartición de artículos del "
-#~ "grupo."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Comando: /exp <política>"
-
-#~ msgid "This command changes the party's experience sharing policy."
-#~ msgstr ""
-#~ "Este comando cambia la política de compartición de experiencia del grupo."
-
-#~ 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."
-
-#~ msgid "Command: /exp"
-#~ msgstr "Comando: /exp"
-
-#~ msgid "This command displays the party's current experience sharing policy."
-#~ msgstr ""
-#~ "Este comando muestra la política actual de compartición experiencia del "
-#~ "grupo."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Compartir objetos habilitado."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Compartir objetos desabilitado."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "No es posible el compartir objetos."
-
-#~ msgid "Item sharing unknown."
-#~ msgstr "Compartir objetos desconocido."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Compartir experiencia activado."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Compartir experiencia desactivado ."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "Imposible compartir experiencia."
-
-#~ msgid "Experience sharing unknown."
-#~ msgstr "Compartir experiencia desconocido."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Fallo al usar el objeto."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Imposible equipar."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Cuenta no encontrada. Por favor re-conéctate."
-
-#~ msgid "New password too short."
-#~ msgstr "Nueva contrasena es muy corta."
-
-#~ msgid "Unregistered ID."
-#~ msgstr "ID no registrada."
-
-#~ msgid "Wrong password."
-#~ msgstr "Contrasena incorrecta."
-
-#~ msgid "Account expired."
-#~ msgstr "La cuenta expiró."
-
-#~ msgid "Rejected from server."
-#~ 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."
-
-#~ msgid "Client too old."
-#~ msgstr "Cliente es demasiado viejo."
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ msgstr ""
-#~ "Has sido baneado temporalmente del juego %s.\n"
-#~ "Por favor contacta un GM de nuestro equipo via el foro."
-
-#~ msgid "Server overpopulated."
-#~ msgstr "Servidor sobrepoblado."
-
-#~ msgid "This user name is already taken."
-#~ msgstr "Este nombre de usuario ya está escogido."
-
-#~ msgid "Username permanently erased."
-#~ msgstr "Nombre de usuario borrado permanentemente."
-
-#~ msgid "Could not create party."
-#~ msgstr "No es posible crear un grupo."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Grupo creado."
-
-#~ msgid "%s has joined your party."
-#~ msgstr "%s se ha unido a tu grupo."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s ya es miembro de otro grupo."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s cancelo tu invitación."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s ahora es un miembro de tu grupo."
-
-#~ msgid "%s can't join your party because party is full."
-#~ msgstr "%s no puede unirse a tu grupo porque está completamente lleno."
-
-#~ msgid "QQQ Unknown invite response for %s."
-#~ msgstr "QQQ respuesta desconocida a la invitacion de %s."
-
-#~ msgid "You have left the party."
-#~ msgstr "Has dejado el grupo."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s dejó tu grupo."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Un miembro desconocido intentó decir: %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Inserta moneda para continuar."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Tu no estás muerto aún... sólo estás descansando."
-
-#~ msgid "You are no more."
-#~ msgstr "Tu ya no existes más."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Parece que dejaste de existir."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Has expirado e ido a ver al tu creador."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Eres un cadáver."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Sin vida, descansa en paz."
-
-#~ msgid "If you weren't so animated, you'd be pushing up the daisies."
-#~ msgstr "Si no estuvieras tan animado, diría que estás muerto."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Tus procesos metabólicos son ya historia."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Estás fuera de tus botas."
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Te han echado a patadas."
-
-#~ msgid ""
-#~ "You've shuffled off your mortal coil, run down the curtain and joined the "
-#~ "bleedin' choir invisibile."
-#~ msgstr ""
-#~ "Has dejado tu cuerpo mortal, bajado las cortinas y unido al sangriento "
-#~ "coro de los invisibles."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Eres un ex-jugador."
-
-#~ msgid "You're pining for the fjords."
-#~ msgstr "Estas avanzando... hacia el barranco."
-
-#~ msgid "Message"
-#~ msgstr "Mensaje"
-
-#~ msgid ""
-#~ "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."
-
-#~ msgid "You are carrying less than half your weight. You can regain health."
-#~ msgstr ""
-#~ "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la "
-#~ "salud."
-
-#~ msgid "You picked up %s."
-#~ msgstr "Has cogido %s."
-
-#~ msgid "You spent %s."
-#~ msgstr "Has gastado %s."
-
-#~ msgid "Cannot raise skill!"
-#~ msgstr "¡Imposible incrementar!"
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Equipar las flechas primero."
-
-#~ msgid "Trade failed!"
-#~ msgstr "¡Fallo al intercambiar!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "¡Fallo al hacer un emoticono!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "¡Fallo al sentarse!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "¡Fallo al crear un chat!"
-
-#~ msgid "Could not join party!"
-#~ msgstr "¡No se puede unir al grupo!"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "¡Imposible gritar!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "PV insuficiente!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "SP insuficiente!"
-
-#~ msgid "You have no memos!"
-#~ msgstr "No tienes ninguna nota armenzada!"
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "No puedes hacer esto ahora mismo!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Parece que necesitas más dinero... ;-)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "¡No puedes usar esta habilidad con este tipo de arma!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Necesitas otra Gema Roja!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Necesitas otra Gema Azul!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Llevas muchas cosas para hacer esto!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Huh? Qué es eso?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Fallo al teletransportar..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "No puedes robar nada..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Veneno no tuvo ningún efecto..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Intercambio es imposible. El otro personaje está muy alejado."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Intercambio imposible. El personaje no existe."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Intercambio cancelado por una razón desconocida."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Intercambio: Tú y %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Intercambio con %s cancelado."
-
-#~ msgid "Unhandled trade cancel packet."
-#~ msgstr "Intercambio no soportado."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr "Error al añadir objeto. El otro jugador lleva mucho peso."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr "Error al anadir objeto. El otro jugador no tiene más espacio."
-
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr "Fallo al agregar artículo. No puedes intercambiar este artículo."
 
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Fallo al anadir objeto por una razón desconocida."
diff --git a/po/fi.po b/po/fi.po
index 6845c5838..40923cdc2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,21 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
-"PO-Revision-Date: 2011-06-20 00:31+0000\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"PO-Revision-Date: 2011-08-08 01:29+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1034
@@ -40,35 +40,35 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -77,50 +77,50 @@ msgstr "Vaihdan pelipalvelinta"
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/client.cpp:1628
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -136,11 +136,11 @@ msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 #: src/commandhandler.cpp:409
 #, 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 ""
-"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
-"käytit omaa nimeäsi."
+"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai"
+" käytit omaa nimeäsi."
 
 #: src/commandhandler.cpp:429
 #, c-format
@@ -295,46 +295,46 @@ msgstr "Orvot resurssikuvat:"
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
-"\"true\", \"false\", \"1\" tai \"0\"."
+"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti"
+" \"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -456,7 +456,7 @@ msgstr "Myy"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -979,7 +979,7 @@ msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "Varastoi"
 
@@ -1375,9 +1375,8 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
 #: src/gui/popupmenu.cpp:684
-#, fuzzy
 msgid "Sell (?)"
-msgstr "Myy"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:292
 msgid "Kick"
@@ -1624,9 +1623,8 @@ msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
 #: src/gui/serverdialog.cpp:239
-#, fuzzy
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr "Valitse palvelimesi"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
@@ -1725,8 +1723,8 @@ msgstr "Huomaa"
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
-"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet "
-"musiikit"
+"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet"
+" musiikit"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -1745,9 +1743,8 @@ msgid "Show chat colors list"
 msgstr "Näytä keskustelun värilista"
 
 #: src/gui/setup_chat.cpp:64
-#, fuzzy
 msgid "Commands"
-msgstr "Komento:"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
@@ -1778,9 +1775,8 @@ msgid "Show chat history"
 msgstr "Näytä keskusteluhistoria"
 
 #: src/gui/setup_chat.cpp:88
-#, fuzzy
 msgid "Messages"
-msgstr "Viesti"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
@@ -1869,11 +1865,11 @@ msgstr "Sininen:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "Hyväksy"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
@@ -2003,9 +1999,8 @@ msgid "Crazy move A program"
 msgstr "Villiliike (a) -ohjelma"
 
 #: src/gui/setup_other.cpp:104
-#, fuzzy
 msgid "Player"
-msgstr "Pelaajat"
+msgstr ""
 
 #: src/gui/setup_other.cpp:106
 msgid "Show own hp bar"
@@ -2040,9 +2035,8 @@ msgid "Enable attack filter"
 msgstr "Ota käyttöön hyökkäyssuodin"
 
 #: src/gui/setup_other.cpp:130
-#, fuzzy
 msgid "Enable advert protocol"
-msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
+msgstr ""
 
 #: src/gui/setup_other.cpp:136
 msgid "Accept sell/buy requests"
@@ -2057,9 +2051,8 @@ msgid "Log NPC dialogue"
 msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
 #: src/gui/setup_other.cpp:149
-#, fuzzy
 msgid "Other"
-msgstr "muu"
+msgstr ""
 
 #: src/gui/setup_other.cpp:151
 msgid "Enable server side attack"
@@ -2085,6 +2078,10 @@ msgstr "Matalan liikenteen tila"
 msgid "Hide shield sprite"
 msgstr "Piilota kilpihahmo"
 
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr "Näytä tausta"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relaatio"
@@ -2162,9 +2159,8 @@ msgid "Visible names"
 msgstr "Näytä nimet"
 
 #: src/gui/setup_players.cpp:341
-#, fuzzy
 msgid "Show statuses"
-msgstr "Näytä tavarat"
+msgstr ""
 
 #: src/gui/setup_theme.cpp:105
 msgid "Tiny (10)"
@@ -2226,8 +2222,8 @@ msgstr "Kirjasimen koko"
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
@@ -2279,132 +2275,136 @@ msgstr "keskitaso"
 msgid "max"
 msgstr "maksimi"
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Hw acceleration"
 msgstr "Rautakiihdytys"
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "Hiukkastehosteet"
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "Näytä ottoviesti"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "keskusteluikkunassa"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "leijuvana"
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 msgid "Enable opacity cache"
 msgstr "Ota käyttöön läpinäkyvyysvälimuisti"
 
-#: src/gui/setup_video.cpp:305
-#, fuzzy
+#: src/gui/setup_video.cpp:306
 msgid "Enable map reduce"
-msgstr "Ota musiikki käyttöön"
+msgstr ""
 
-#: src/gui/setup_video.cpp:307
-msgid "Show background"
-msgstr "Näytä tausta"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
 msgstr "Piirtonopeusrajoitin (FPS):"
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 msgid "Alt FPS limit: "
 msgstr "Vaihtoehtoinen FPS-rajoitin:"
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Kuva"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "Tekstinä yläpuolella"
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
 msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
 msgstr "-"
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
+msgstr ""
+"Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
 msgstr "Vaihdan kokoruututilaan"
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Oma tarkkuus (esim. 1024x768)"
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr "Anna uusi tarkkuus:                  "
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 msgid "Screen Resolution Changed"
 msgstr "Ikkunan koko vaihdettu"
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
 msgstr "Hiukkastehosteiden asetuksia on muutettu."
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
 
@@ -3202,7 +3202,8 @@ msgid "Change"
 msgstr "Muuta"
 
 #: src/gui/tradewindow.cpp:332
-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 "Tavaran lisääminen epäonnistui, limittämisongelma."
 
 #: src/gui/tradewindow.cpp:377
@@ -3547,7 +3548,8 @@ msgid "Command: /unignore <player>"
 msgstr "Komento: /unignore <pelaajan nimi>"
 
 #: 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 ""
 "Tämä komento huomioi pelaajan taas, jos tämä on ensin jätetty huomiotta."
 
@@ -3906,9 +3908,8 @@ msgid "Next Chat Tab"
 msgstr "Seuraava keskusteluvälilehti"
 
 #: src/keyboardconfig.cpp:278
-#, fuzzy
 msgid "Close current Chat Tab"
-msgstr "Seuraava keskusteluvälilehti"
+msgstr ""
 
 #: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
@@ -4782,493 +4783,4 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
-#~ msgid ""
-#~ "Access denied. Most likely, there are too many players on this server."
-#~ msgstr ""
-#~ "Pääsy evätty. Todennäköisesti palvelimella on liian paljon pelaajia."
-
-#~ msgid "Cannot use this ID."
-#~ msgstr "Tätä tunnistetta ei voi käyttää."
-
-#~ msgid "Unknown char-server failure."
-#~ msgstr "Tuntematon hahmopalvelinvirhe."
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr ""
-#~ "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
-
-#~ msgid "Wrong name."
-#~ msgstr "Väärä nimi."
-
-#~ msgid "Incorrect stats."
-#~ msgstr "Väärät arvot."
-
-#~ msgid "Incorrect hair."
-#~ msgstr "Väärä hiustyyli."
-
-#~ msgid "Incorrect slot."
-#~ msgstr "Väärä paikka."
-
-#~ msgid "Character deleted."
-#~ msgstr "Hahmo poistettu."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Hahmon poisto epäonnistui."
-
-#~ msgid "Strength:"
-#~ msgstr "Voima:"
-
-#~ msgid "Agility:"
-#~ msgstr "Ketteryys:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Elinvoima:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Älykkyys:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Näppäryys:"
-
-#~ msgid "Luck:"
-#~ msgstr "Tuuri:"
-
-#~ msgid "Whisper could not be sent, %s is offline."
-#~ msgstr "Kuiskausta ei voitu lähettää, %s ei ole kirjautuneena sisään."
-
-#~ msgid "Whisper could not be sent, ignored by %s."
-#~ msgstr "Kuiskausta ei voitu lähettää, %s ei huomioinut sitä."
-
-#~ msgid "MVP player."
-#~ msgstr "MVP-pelaaja."
-
-#~ msgid "MVP player: "
-#~ msgstr "MVP-pelaaja: "
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Kanavia ei tueta!"
-
-#~ msgid "Online users: %d"
-#~ msgstr "Käyttäjiä palvelimella: %d"
-
-#~ msgid "Game"
-#~ msgstr "Peli"
-
-#~ msgid "Request to quit denied!"
-#~ msgstr "Lopetuspyyntö evätty!"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Näytä tämä ohje."
-
-#~ msgid "/invite > Invite a player to your guild"
-#~ msgstr "/invite > Kutsu pelaaja kiltaasi"
-
-#~ msgid "/leave > Leave the guild you are in"
-#~ msgstr "/leave > Eroa nykyisestä killastasi"
-
-#~ msgid "/kick > Kick some one from the guild you are in"
-#~ msgstr "/kick > Poista käyttäjä killastasi"
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Komento: /invite <nimi>"
-
-#~ msgid "This command invites <nick> to the guild you're in."
-#~ msgstr "Tämä komento kutsuu annetun pelaajan nykyiseen kiltaasi."
-
-#~ msgid "Command: /leave"
-#~ msgstr "Komento: /leave"
-
-#~ msgid "This command causes the player to leave the guild."
-#~ msgstr "Tämä komento saa sinut eroamaan killasta."
-
-#~ msgid "You are already in guild."
-#~ msgstr "Olet jo killassa."
-
-#~ msgid "Emperium check failed."
-#~ msgstr "Emperium-tarkistus epäonnistui."
-
-#~ msgid "Unknown server response."
-#~ msgstr "Tuntematon palvelimen vastaus."
-
-#~ msgid "Guild name: %s"
-#~ msgstr "Killan nimi: %s"
-
-#~ msgid "Guild master: %s"
-#~ msgstr "Kiltamestari: %s"
-
-#~ msgid "Guild level: %d"
-#~ msgstr "Kiltataso: %d"
-
-#~ msgid "Online members: %d"
-#~ msgstr "Jäseniä linjoilla: %d"
-
-#~ msgid "Max members: %d"
-#~ msgstr "Jäsenmaksimi: %d"
-
-#~ msgid "Average level: %d"
-#~ msgstr "Keskim. taso: %d"
-
-#~ msgid "Guild exp: %d"
-#~ msgstr "Kiltakokemusta: %d kkp"
-
-#~ msgid "Guild next exp: %d"
-#~ msgstr "Seuraavaan tasoon: %d kkp"
-
-#~ msgid "Guild castle: %s"
-#~ msgstr "Killan linna: %s"
-
-#~ msgid "Could not inivte user to guild."
-#~ msgstr "Pelaajan kutsuminen kiltaan epäonnistui."
-
-#~ msgid "User rejected guild invite."
-#~ msgstr "Käyttäjä ei ottanut kiltakutsua vastaan."
-
-#~ msgid "User is now part of your guild."
-#~ msgstr "Käyttäjä liittyi kiltaasi."
-
-#~ msgid "Your guild is full."
-#~ msgstr "Kiltasi on täynnä."
-
-#~ msgid "Unknown guild invite response."
-#~ msgstr "Tuntematon vastaus kiltakutsuun."
-
-#~ msgid "You have left the guild."
-#~ msgstr "Olet eronnut killasta."
-
-#~ msgid "%s has left your guild."
-#~ msgstr "%s on eronnut killastasi."
-
-#~ msgid "You was kicked from guild."
-#~ msgstr "Sinut on potkittu killasta."
-
-#~ msgid "%s has kicked from your guild."
-#~ msgstr "%s on potkittu ulos killastasi."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Kutsu pelaaja ryhmääsi"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Eroa nykyisestä ryhmästäsi"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Potki pelaaja ryhmästäsi"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr "/item > Näytä/muuta ryhmän tavaranjaon asetuksia"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr "/exp > Näytä/muuta ryhmän kokemuksenjaon asetuksia"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Tämä komento kutsuu annetun pelaajan ryhmääsi."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Tämä komento erottaa pelaajan ryhmästä."
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Komento: /item <jakopolitiikka>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr "Tämä komento muuttaa ryhmän saaliinjakopolitiikkaa."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, "
-#~ "or \"0\", \"no\", \"false\" to disable item sharing."
-#~ msgstr ""
-#~ "<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin "
-#~ "saalis jaetaan, tai \"0\", \"no\" tai \"false\", jolloin saalista ei "
-#~ "jaeta."
-
-#~ msgid "Command: /item"
-#~ msgstr "Komento: /item"
-
-#~ msgid "This command displays the party's current item sharing policy."
-#~ msgstr "Tämä komento näyttää ryhmän nykyisen saaliinjakopolitiikan."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Komento: /exp <jakopolitiikka>"
-
-#~ msgid "This command changes the party's experience sharing policy."
-#~ msgstr "Tämä komento muuttaa ryhmän kokemuksenjaon politiikkaa."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-#~ "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-#~ msgstr ""
-#~ "<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin "
-#~ "kokemuspisteet jaetaan, tai \"0\", \"no\" tai \"false\", jolloin "
-#~ "kokemuspisteitä ei jaeta."
-
-#~ msgid "Command: /exp"
-#~ msgstr "Komento: /exp"
-
-#~ msgid "This command displays the party's current experience sharing policy."
-#~ msgstr "Tämä komento näyttää ryhmän nykyisen kokemuksenjaon politiikan."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Saaliinjako käytössä."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Saaliinjako poistettu käytöstä."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "Saaliinjako ei ole mahdollista."
-
-#~ msgid "Item sharing unknown."
-#~ msgstr "Saaliinjaon tila on tuntematon."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Kokemuksen jako käytössä."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Kokemuksen jako pois käytöstä."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "Kokemuksen jako ei ole mahdollista."
-
-#~ msgid "Experience sharing unknown."
-#~ msgstr "Kokemuksen jaon tila on tuntematon."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Tavaran käyttö ei onnistunut."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Käyttöönotto ei onnistunut."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
-
-#~ msgid "New password too short."
-#~ msgstr "Uusi salasana on liian lyhyt."
-
-#~ msgid "Unregistered ID."
-#~ msgstr "Rekisteröimätön tunniste."
-
-#~ msgid "Wrong password."
-#~ msgstr "Väärä salasana."
-
-#~ msgid "Account expired."
-#~ msgstr "Tili vanhentunut."
-
-#~ msgid "Rejected from server."
-#~ msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
-
-#~ msgid ""
-#~ "You have been permanently banned from the game. Please contact the GM "
-#~ "team."
-#~ msgstr ""
-#~ "Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
-
-#~ msgid "Client too old."
-#~ msgstr "Liian vanha asiakasohjelma."
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ msgstr ""
-#~ "Pääsysi peliin on väliaikaisesti estetty %s asti.\n"
-#~ "Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
-
-#~ msgid "Server overpopulated."
-#~ msgstr "Palvelin on täynnä."
-
-#~ msgid "This user name is already taken."
-#~ msgstr "Käyttäjätunnus on jo käytössä."
-
-#~ msgid "Username permanently erased."
-#~ msgstr "Käyttäjänimi pysyvästi poistettu."
-
-#~ msgid "Could not create party."
-#~ msgstr "Ryhmän luonti epäonnistui."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Ryhmä luotu."
-
-#~ msgid "%s has joined your party."
-#~ msgstr "%s on liittynyt ryhmääsi."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s kuuluu jo johonkin ryhmään."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s ei ottanut kutsuasi vastaan."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s on nyt ryhmäsi jäsen."
-
-#~ msgid "%s can't join your party because party is full."
-#~ msgstr "%s ei voi liittyä ryhmääsi, koska se on täynnä."
-
-#~ msgid "QQQ Unknown invite response for %s."
-#~ msgstr "QQQ Tuntematon kutsuvastaus kohteella %s."
-
-#~ msgid "You have left the party."
-#~ msgstr "Erosit ryhmästä."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s on eronnut ryhmästä."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Tuntematon jäsen yritti sanoa: %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Syötä kolikko jatkaaksesi."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Et ole kuollut vielä, lepäät vain."
-
-#~ msgid "You are no more."
-#~ msgstr "Olet lakannut olemasta."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Olet kuollut kuin päivänkakkaraa pukkaava ex-papukaija."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Olet lähtenyt moikkaamaan luojaasi."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Raato mikä raato."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Olet eloton, mutta lepäät rauhassa."
-
-#~ msgid "If you weren't so animated, you'd be pushing up the daisies."
-#~ msgstr "Ellet olisi näin liikkuvainen, pukkaisit päivänkakkaraa."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Aineenvaihduntaprosessisi ovat historiaa."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Olet lopultakin nakkisuojassa."
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Potkaisit tyhjää."
-
-#~ msgid ""
-#~ "You've shuffled off your mortal coil, run down the curtain and joined the "
-#~ "bleedin' choir invisibile."
-#~ msgstr ""
-#~ "Olet heittänyt henkesi, poistunut keskuudestamme ja loikannut Tuonelan "
-#~ "jokeen."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Olet entinen pelaaja."
-
-#~ msgid "You're pining for the fjords."
-#~ msgstr "Kaipaat kotivuonoille."
-
-#~ msgid "Message"
-#~ msgstr "Viesti"
-
-#~ msgid ""
-#~ "You are carrying more than half your weight. You are unable to regain "
-#~ "health."
-#~ msgstr ""
-#~ "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
-
-#~ msgid "You are carrying less than half your weight. You can regain health."
-#~ msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
-
-#~ msgid "You picked up %s."
-#~ msgstr "%s nostettu."
-
-#~ msgid "You spent %s."
-#~ msgstr "Käytit %s."
-
-#~ msgid "Cannot raise skill!"
-#~ msgstr "Taidon korottaminen epäonnistui!"
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Varusta ensin nuolia."
-
-#~ msgid "Trade failed!"
-#~ msgstr "Kauppa epäonnistui!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Elehtiminen epäonnistui!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Istuminen epäonnistui!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Keskustelun luonti epäonnistui!"
-
-#~ msgid "Could not join party!"
-#~ msgstr "Ryhmään liittyminen epäonnistui!"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Huutaminen epäonnistui!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Et ole vielä riittävän korkealla tasolla!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "Voimapisteesi eivät riitä!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "Manapisteesi eivät riitä!"
-
-#~ msgid "You have no memos!"
-#~ msgstr "Sinulla ei ole muistioita (memo)."
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Et voi tehdä tätä juuri nyt."
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Näyttää siltä että tarvitset lisää rahaa."
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa."
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Tarvitset toisen punaisen helmen."
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Tarvitset toisen sinisen helmen."
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Kannat liian paljon tehdäksesi tällaista!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Siis mikä?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Siirtymä (warp) epäonnistui..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Varastaminen ei onnistunut..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Myrkyllä ei ollut vaikutusta..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Kaupanteko ei ole mahdollista. kauppa kumppani on liian kaukana."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Kaupanteko ei ole mahdollista. Hahmoa ei ole."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Kaupanteko keskeytyi tuntemattomasta syystä."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Kauppa: sinä ja %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Kaupanteko pelaajan %s kanssa peruttu."
-
-#~ msgid "Unhandled trade cancel packet."
-#~ msgstr "Käsittelemätön kaupan peruutus -paketti."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr ""
-#~ "Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr ""
-#~ "Tavaran lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille."
-
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr "Tavaran lisääminen epäonnistui. Et voi kaupitella sitä."
 
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Tavaran lisääminen epäonnistui tuntemattomasta syystä."
diff --git a/po/fr.po b/po/fr.po
index 42edcd325..746948d6e 100644
--- a/po/fr.po
+++ b/po/fr.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.
-#
+# 
 #   <antoinebcn@hotmail.com>, 2011.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
 # Bernard  <nard@bh28.net>, 2011.
@@ -10,15 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
-"PO-Revision-Date: 2011-07-21 23:49+0000\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"PO-Revision-Date: 2011-08-08 01:29+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
-"fr/)\n"
-"Language: fr\n"
+"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1034
@@ -43,35 +42,35 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -80,50 +79,50 @@ msgstr "Changement de serveur de jeu"
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/client.cpp:1628
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -140,11 +139,11 @@ msgstr "Vous ne pouvez pas envoyer de messages vides."
 #: src/commandhandler.cpp:409
 #, 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 ""
-"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
-"\". Soit elle existe déjà, soit il s'agit de vous même."
+"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom "
+"\"%s\". Soit elle existe déjà, soit il s'agit de vous même."
 
 #: src/commandhandler.cpp:429
 #, c-format
@@ -299,47 +298,46 @@ msgstr "Images des ressources non affectées :"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Informations"
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -461,7 +459,7 @@ msgstr "Vendre"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -984,7 +982,7 @@ msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "Entreposer"
 
@@ -1869,11 +1867,11 @@ msgstr "Bleu : "
 msgid "Alpha:"
 msgstr "Opacité : "
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
@@ -2082,6 +2080,10 @@ msgstr "Mode traffic faible"
 msgid "Hide shield sprite"
 msgstr "Cacher le bouclier"
 
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr "Montrer le fond"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relation"
@@ -2222,8 +2224,8 @@ msgstr "Taille de police"
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
 
@@ -2275,138 +2277,142 @@ msgstr "moyen"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Hw acceleration"
 msgstr "Accélération matériel"
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "Effets de particules"
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "Afficher les messages de ramassage"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "dans la conversation"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "avec des particules"
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 msgid "Enable opacity cache"
 msgstr "Activer le cache transparence"
 
-#: src/gui/setup_video.cpp:305
+#: src/gui/setup_video.cpp:306
 msgid "Enable map reduce"
 msgstr "Authoriser la réduction des cartes"
 
-#: src/gui/setup_video.cpp:307
-msgid "Show background"
-msgstr "Montrer le fond"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 msgid "Alt FPS limit: "
 msgstr "Alterner les limites FPS"
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "Texte aérien"
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
 msgstr "Détail des particules"
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
 msgstr "Rien"
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution personnalisée (Exemple : 1024x768)"
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr "Entrer la nouvelle résolution : "
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
 "réduite."
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
 msgstr "Paramètres d'effet de particules modifiés."
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
@@ -2618,8 +2624,8 @@ msgstr "Choisissez le nom de la guilde."
 #: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
-"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
-"dans une."
+"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà"
+" dans une."
 
 #: src/gui/socialwindow.cpp:1315
 #, c-format
@@ -3208,7 +3214,8 @@ msgid "Change"
 msgstr "Changer"
 
 #: src/gui/tradewindow.cpp:332
-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 ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
@@ -3450,7 +3457,8 @@ msgstr "Commande : /users"
 
 #: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
-msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+msgstr ""
+"Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
@@ -3559,8 +3567,10 @@ msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -4207,7 +4217,8 @@ msgstr ""
 
 #: src/main.cpp:71
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+msgstr ""
+"      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
@@ -4806,507 +4817,4 @@ msgstr "PM %+d"
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
-#~ msgid ""
-#~ "Access denied. Most likely, there are too many players on this server."
-#~ msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
-
-#~ msgid "Cannot use this ID."
-#~ msgstr "Vous ne pouvez utiliser cette identification."
-
-#~ msgid "Unknown char-server failure."
-#~ msgstr "Erreur inconnue du serveur de personnage."
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr ""
-#~ "Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
-#~ "utilisé."
-
-#~ msgid "Wrong name."
-#~ msgstr "Mauvais nom."
-
-#~ msgid "Incorrect stats."
-#~ msgstr "Stats incorrectes."
-
-#~ msgid "Incorrect hair."
-#~ msgstr "Cheveux incorrects."
-
-#~ msgid "Incorrect slot."
-#~ msgstr "Case incorrecte."
-
-#~ msgid "Character deleted."
-#~ msgstr "Personnage supprimé."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "La suppression du personnage n'a pu s'effectuer."
-
-#~ msgid "Strength:"
-#~ msgstr "Force :"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilité :"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalité :"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Intelligence :"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Dextérité :"
-
-#~ msgid "Luck:"
-#~ msgstr "Volonté :"
-
-#~ msgid "Whisper could not be sent, %s is offline."
-#~ msgstr "Le message n'a pu être envoyé, %s n'est pas en ligne."
-
-#~ msgid "Whisper could not be sent, ignored by %s."
-#~ msgstr "Le message privé n'a pu être envoyé, vous êtes ignoré par %s."
-
-#~ msgid "MVP player."
-#~ msgstr "Joueur MVP"
-
-#~ msgid "MVP player: "
-#~ msgstr "MVP joueur :"
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Les salons ne sont pas gérés !"
-
-#~ msgid "Online users: %d"
-#~ msgstr "Joueurs en ligne : %d"
-
-#~ msgid "Game"
-#~ msgstr "Jeu"
-
-#~ msgid "Request to quit denied!"
-#~ msgstr "Requête de départ refusée !"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Affiche cette aide."
-
-#~ msgid "/invite > Invite a player to your guild"
-#~ msgstr "/invite > Invite un joueur à rejoindre votre guilde"
-
-#~ msgid "/leave > Leave the guild you are in"
-#~ msgstr "/leave > Quitter la guilde courante"
-
-#~ msgid "/kick > Kick some one from the guild you are in"
-#~ msgstr "/kick > Éjecter quelqu'un du groupe dont vous faites partie"
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Commande : /invite <nom du personnage>"
-
-#~ msgid "This command invites <nick> to the guild you're in."
-#~ msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
-
-#~ msgid "Command: /leave"
-#~ msgstr "Commande : /leave"
-
-#~ msgid "This command causes the player to leave the guild."
-#~ msgstr "Cette commande vous fait quitter la guilde actuelle."
-
-#~ msgid "You are already in guild."
-#~ msgstr "Vous faîtes déjà membre d'une guilde."
-
-#~ msgid "Emperium check failed."
-#~ msgstr "Erreur dans la création de la guilde."
-
-#~ msgid "Unknown server response."
-#~ msgstr "Réponse inconnue du serveur."
-
-#~ msgid "Guild name: %s"
-#~ msgstr "Nom de la guilde : %s"
-
-#~ msgid "Guild master: %s"
-#~ msgstr "Maître de la guilde : %s"
-
-#~ msgid "Guild level: %d"
-#~ msgstr "Niveau de la guilde : %d"
-
-#~ msgid "Online members: %d"
-#~ msgstr "Membres en ligne : %d"
-
-#~ msgid "Max members: %d"
-#~ msgstr "Membres maximums : %d"
-
-#~ msgid "Average level: %d"
-#~ msgstr "Niveau moyen : %d"
-
-#~ msgid "Guild exp: %d"
-#~ msgstr "Expérience Groupe : %d"
-
-#~ msgid "Guild next exp: %d"
-#~ msgstr "Expérience suivante pour la guilde : %d"
-
-#~ msgid "Guild castle: %s"
-#~ msgstr "Château de la guilde : %s"
-
-#~ msgid "Could not inivte user to guild."
-#~ msgstr "N'a pas pu inviter le joueur dans la guilde. "
-
-#~ msgid "User rejected guild invite."
-#~ msgstr "Le joueur a refusé l'invitation dans la guilde."
-
-#~ msgid "User is now part of your guild."
-#~ msgstr "%s est maintenant membre de la guilde."
-
-#~ msgid "Your guild is full."
-#~ msgstr "Votre guilde est complète."
-
-#~ msgid "Unknown guild invite response."
-#~ msgstr "Réponse d'invitation à la guilde inconnue."
-
-#~ msgid "You have left the guild."
-#~ msgstr "vous avez quitté la guilde."
-
-#~ msgid "%s has left your guild."
-#~ msgstr "%s a quitté votre guilde."
-
-#~ msgid "You was kicked from guild."
-#~ msgstr "Vous avez été renvoyé de la guilde."
-
-#~ msgid "%s has kicked from your guild."
-#~ msgstr "%s a sorti quelqu'un de votre guilde."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Invite un joueur à rejoindre votre groupe"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr ""
-#~ "/item > Affiche / Modifie les préférences d'échange d'objet du groupe"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Cette commande vous fait quitter votre groupe actuel."
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Commande : /item <policy>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr "Cette commande change les préférences d'échange d'objet du groupe."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, "
-#~ "or \"0\", \"no\", \"false\" to disable item sharing."
-#~ msgstr ""
-#~ "<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
-#~ "d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
-
-#~ msgid "Command: /item"
-#~ msgstr "Commande : /item"
-
-#~ msgid "This command displays the party's current item sharing policy."
-#~ msgstr ""
-#~ "Cette commande affiche les préférences actuelles du groupe sur le partage "
-#~ "d'objet."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Commande : /exp <policy>"
-
-#~ msgid "This command changes the party's experience sharing policy."
-#~ msgstr ""
-#~ "Cette commande change les préférences du groupe sur le partage "
-#~ "d'expérience."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-#~ "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-#~ msgstr ""
-#~ "<préférences> peut être \"1\", \"yes\", \"true\" pour activer le partage "
-#~ "d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
-
-#~ msgid "Command: /exp"
-#~ msgstr "Commande : /exp"
-
-#~ msgid "This command displays the party's current experience sharing policy."
-#~ msgstr ""
-#~ "Cette commande affiche les préférences actuelles du groupe sur le partage "
-#~ "d'expérience."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Partage d'objet activé."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Partage d'objet désactivé."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "Partage d'objet impossible."
-
-#~ msgid "Item sharing unknown."
-#~ msgstr "Paramètre de partage d'objets inconnu."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Partage d'expérience autorisé."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Partage d'expérience non autorisé."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "Partage d'expérience impossible."
-
-#~ msgid "Experience sharing unknown."
-#~ msgstr "Paramètre de partage d'expérience inconnu."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Impossible d'utiliser l'objet."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Impossible d'équiper cet objet."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
-
-#~ msgid "New password too short."
-#~ msgstr "Le nouveau mot de passe est trop court."
-
-#~ msgid "Unregistered ID."
-#~ msgstr "Id non enregistrée."
-
-#~ msgid "Wrong password."
-#~ msgstr "Mauvais mot de passe."
-
-#~ msgid "Account expired."
-#~ msgstr "Le compte a expiré."
-
-#~ msgid "Rejected from server."
-#~ msgstr "Rejeté par le serveur."
-
-#~ msgid ""
-#~ "You have been permanently banned from the game. Please contact the GM "
-#~ "team."
-#~ msgstr ""
-#~ "Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
-#~ "contact avec l'équipe des GM."
-
-#~ msgid "Client too old."
-#~ msgstr "Client trop ancien."
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ msgstr ""
-#~ "Vous avez temporairement été banni du jeu jusqu'au %s.\n"
-#~ "Merci de vous mettre en contact avec l'équipe des GM sur le forum."
-
-#~ msgid "Server overpopulated."
-#~ msgstr "Serveur surpeuplé."
-
-#~ msgid "This user name is already taken."
-#~ msgstr "Ce nom d'utilisateur est déjà utilisé."
-
-#~ msgid "Username permanently erased."
-#~ msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
-
-#~ msgid "Could not create party."
-#~ msgstr "Le groupe n'a pu être créé."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Création du groupe réussie."
-
-#~ msgid "%s has joined your party."
-#~ msgstr "%s a rejoint votre groupe."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s est déjà membre du groupe."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s a refusé votre invitation."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s est maintenant membre de votre groupe."
-
-#~ msgid "%s can't join your party because party is full."
-#~ msgstr "%s ne peut rejoindre votre groupe. Celui-ci est complet."
-
-#~ msgid "QQQ Unknown invite response for %s."
-#~ msgstr "QQQ Erreur inconnue sur l'invitation de %s."
-
-#~ msgid "You have left the party."
-#~ msgstr "Vous avez quitté le groupe."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s a quitté le groupe."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Un membre inconnu a essayé de dire : %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Introduire une pièce pour continuer"
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement."
-
-#~ msgid "You are no more."
-#~ msgstr "Vous n'existez plus."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Vous avez cessez d'exister."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Tu es fini. Tu es parti retrouver ton créateur."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Tu es un dur."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Privé de toute essence de vie, tu reposes en paix."
-
-#~ msgid "If you weren't so animated, you'd be pushing up the daisies."
-#~ msgstr ""
-#~ "Si tu n'étais pas autant en forme, tu serais en train de manger les "
-#~ "pissenlits par la racine."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Vos processus métaboliques appartiennent au passé maintenant."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Tu es en dehors des clous"
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Tu viens de toucher le fond."
-
-#~ msgid ""
-#~ "You've shuffled off your mortal coil, run down the curtain and joined the "
-#~ "bleedin' choir invisibile."
-#~ msgstr ""
-#~ "Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez "
-#~ "rejoint l'armée de l'ombre."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
-
-#~ msgid "You're pining for the fjords."
-#~ msgstr "Tu reposes au fond de l'eau."
-
-#~ msgid "Message"
-#~ msgstr "Message"
-
-#~ msgid ""
-#~ "You are carrying more than half your weight. You are unable to regain "
-#~ "health."
-#~ msgstr ""
-#~ "Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes "
-#~ "plus en mesure de regagner vos points de vie."
-
-#~ msgid "You are carrying less than half your weight. You can regain health."
-#~ msgstr ""
-#~ "Vous portez moins que la moitié de votre poids. Vous pouvez récupérer "
-#~ "votre santé."
-
-#~ msgid "You picked up %s."
-#~ msgstr "Vous avez ramassé  %s."
-
-#~ msgid "You spent %s."
-#~ msgstr "Vous avez dépensé %s."
-
-#~ msgid "Cannot raise skill!"
-#~ msgstr "Ne peut pas augmenter la capacité !"
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Équiper d'abord les flèches!"
-
-#~ msgid "Trade failed!"
-#~ msgstr "Échec de la transaction !"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Émoticône non réalisée !"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Vous n'avez pas pu vous asseoir !"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Vous n'avez pas pu créer la conversation !"
-
-#~ msgid "Could not join party!"
-#~ msgstr "Vous n'avez pas pu rejoindre le groupe !"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Vous ne pouvez pas crier !"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Vous n'avez pas atteint un niveau suffisant !"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "Pas assez de vie !"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "PV insuffisant !"
-
-#~ msgid "You have no memos!"
-#~ msgstr "Vous n'avez pas de messages !"
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Vous ne pouvez faire cela maintenant !"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Vous ne pouvez utiliser ce pouvoir avec ce type d'arme !"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Vous portez trop de choses pour pouvoir faire cela !"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Hé ? Qu'est-ce donc que cela ?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Enchainement échoué..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Vous n'avez rien pu voler..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Le poison fut sans effet..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "L'échange est impossible. Votre partenaire est trop éloigné."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Échange impossible. Ce personnage n'existe pas."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Échange annulé pour une raison inconnue."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Échange : Vous et %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Échange avec %s annulé."
-
-#~ msgid "Unhandled trade cancel packet."
-#~ msgstr "Échange non pris en compte."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr ""
-#~ "Impossible de rajouter un objet. Votre partenaire pour cet échange est "
-#~ "surchargé."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr ""
-#~ "Impossible de rajouter un objet. Votre partenaire pour cet échange n'a "
-#~ "plus de place libre."
-
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr ""
-#~ "Impossible d'ajouter l'objet. Celui-ci ne peut pas être échangeable."
 
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Impossible de rajouter un objet pour une raison inconnue."
diff --git a/po/hr.po b/po/hr.po
index 895bcf240..a1dc5999a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -44,40 +44,40 @@ msgstr ""
 msgid "I"
 msgstr "Je"
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 #, fuzzy
 msgid "Logging in"
 msgstr "Korisničko ime"
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Odaberi lika"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -86,54 +86,54 @@ msgstr "Server"
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 #, fuzzy
 msgid "Password Change"
 msgstr "Lozinka"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 #, fuzzy
 msgid "Email Change"
 msgstr "Izmijeni"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Član je uspješno unaprijeđen."
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Odjavi"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1628
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -326,46 +326,46 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Općenito"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Screenshot spremljen u ~/"
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "Veza s poslužiteljem je bila izgubljena, program će se sada zatvoriti"
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Ne mogu učitati karte"
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom učitavanja %s"
@@ -489,7 +489,7 @@ msgstr "Prodaj"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -1054,7 +1054,7 @@ msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "Pohrani"
 
@@ -2018,11 +2018,11 @@ msgstr "Plava: "
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "Primjeni"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
@@ -2245,6 +2245,11 @@ msgstr ""
 msgid "Hide shield sprite"
 msgstr ""
 
+#: src/gui/setup_other.cpp:169
+#, fuzzy
+msgid "Show background"
+msgstr "Pozadina"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Odnos"
@@ -2399,8 +2404,8 @@ msgstr "Veličina fonta"
 msgid "Theme Changed"
 msgstr "Izmijeni"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
@@ -2454,142 +2459,145 @@ msgstr "srednje"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "Pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 #, fuzzy
 msgid "Hw acceleration"
 msgstr "Odnos"
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "Vlastiti kursor"
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "Efekt čestica"
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "Prikaži obavijesti o prikupljanju."
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "u chat-u"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "kao čestica"
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 #, fuzzy
 msgid "Enable opacity cache"
 msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_video.cpp:305
+#: src/gui/setup_video.cpp:306
 #, fuzzy
 msgid "Enable map reduce"
 msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_video.cpp:307
-#, fuzzy
-msgid "Show background"
-msgstr "Pozadina"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:315
 #, fuzzy
 msgid "FPS limit:"
 msgstr "Ograničenje sličica u sekundi"
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "Ograničenje sličica u sekundi"
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Slika"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "Tekst iznad glave"
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "Prozirnost sučelja"
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "Efekti okruženja"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 #, fuzzy
 msgid "Particle detail"
 msgstr "Detalji Čestica"
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 #, fuzzy
 msgid "None"
 msgstr "Ne"
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Prebacivanje u pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Promjena OpenGL-a"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Rezolucija Ekrana promijenjena"
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Postavke efekta čestica su promijenjene."
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "Promjene će stupiti na snagu na promjeni karte."
 
diff --git a/po/hu.po b/po/hu.po
index cf565f515..97331ec07 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -43,40 +43,40 @@ msgstr ""
 msgid "I"
 msgstr "Is"
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 #, fuzzy
 msgid "Logging in"
 msgstr "Belépés"
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Szerver"
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -85,54 +85,54 @@ msgstr "Szerver"
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 #, fuzzy
 msgid "Password Change"
 msgstr "Jelszó:"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 #, fuzzy
 msgid "Email Change"
 msgstr "Változtatás"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "A tag előléptetése sikeres."
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Regisztráció megszüntetése"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1628
+#: src/client.cpp:1629
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Helytelen frissítési kiszolgáló: "
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -321,46 +321,46 @@ msgstr ""
 "Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", "
 "\"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Általános"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Képernyőt mentettük a ~/ helyre"
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr "A kapcsolat megszakadt a szerverrel, a program most kilép."
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Kereskedési kérelmek elutasítása"
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 #, fuzzy
 msgid "Could Not Load Map"
 msgstr "Nem lehet betölteni a térképet"
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
@@ -484,7 +484,7 @@ msgstr "Eladás"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -1050,7 +1050,7 @@ msgstr "Súly:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "Raktároz"
 
@@ -2012,11 +2012,11 @@ msgstr "Kék: "
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "Alkalmaz"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "Ablakok alaphelyzetbe"
 
@@ -2239,6 +2239,11 @@ msgstr ""
 msgid "Hide shield sprite"
 msgstr ""
 
+#: src/gui/setup_other.cpp:169
+#, fuzzy
+msgid "Show background"
+msgstr "Háttér"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Kapcsolat"
@@ -2393,8 +2398,8 @@ msgstr "Betűméret"
 msgid "Theme Changed"
 msgstr "Változtatás"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
@@ -2448,144 +2453,147 @@ msgstr "közepes"
 msgid "max"
 msgstr "max."
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "Teljes képernyő"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 #, fuzzy
 msgid "Hw acceleration"
 msgstr "Kapcsolat"
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "Egyéni kurzor"
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "Játékbéli effektek"
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "Értesítés tárgy felvételkor"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "Chat-en belül"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "Karakter felett"
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 #, fuzzy
 msgid "Enable opacity cache"
 msgstr "Joystick engedélyezése"
 
-#: src/gui/setup_video.cpp:305
+#: src/gui/setup_video.cpp:306
 #, fuzzy
 msgid "Enable map reduce"
 msgstr "Joystick engedélyezése"
 
-#: src/gui/setup_video.cpp:307
-#, fuzzy
-msgid "Show background"
-msgstr "Háttér"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:315
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 #, fuzzy
 msgid "Alt FPS limit: "
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Videó"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "Fej feletti szöveg"
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "Menük áttetszősége"
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "Környezeti effektek"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 #, fuzzy
 msgid "Particle detail"
 msgstr "Effektek részletessége"
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 #, fuzzy
 msgid "None"
 msgstr "Nem"
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Ez a mód és az előző mód visszaállítása sikertelen."
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Átállás teljes képernyőre"
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "OpenGL átállítása"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "A képernyő felbontása megváltozott"
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Effektek beállítása megváltozott."
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "A változások érvénybe lépéséhez töltsön be egy új térképet."
 
diff --git a/po/id.po b/po/id.po
index 469511cf9..18553e4fe 100644
--- a/po/id.po
+++ b/po/id.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.
-#
+# 
 #   <adjieps@yahoo.com>, 2011.
 #   <Genesis_Junior@yahoo.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
@@ -9,15 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
-"PO-Revision-Date: 2011-08-04 10:53+0000\n"
-"Last-Translator: adjieps <adjieps@yahoo.com>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
-"id/)\n"
-"Language: id\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"PO-Revision-Date: 2011-08-08 01:29+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1034
@@ -42,35 +41,35 @@ msgstr "A"
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -79,50 +78,50 @@ msgstr "Pergantian server"
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/client.cpp:1628
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -138,8 +137,8 @@ msgstr "Tidak dapat mengirimkan pesan tanpa nama"
 #: src/commandhandler.cpp:409
 #, 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 ""
 "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
 "atau nama anda sendiri"
@@ -291,46 +290,45 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
+msgstr "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Umum"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -452,7 +450,7 @@ msgstr "Jual"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -975,7 +973,7 @@ msgstr "Berat"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "Simpan"
 
@@ -1857,11 +1855,11 @@ msgstr "Biru:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "Terapkan"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
@@ -2070,6 +2068,10 @@ msgstr ""
 msgid "Hide shield sprite"
 msgstr ""
 
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr "Perlihatkan latar belakang"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Hubungan"
@@ -2210,8 +2212,8 @@ msgstr "Ukuran huruf"
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
 
@@ -2263,130 +2265,134 @@ msgstr "sedang"
 msgid "max"
 msgstr "maksimal"
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Hw acceleration"
 msgstr "Akselerasi perangkat keras"
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "Modifikasi kursor"
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "Efek partikel"
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "Perlihatkan notifikasi pengambilan item"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "dalam obrolan"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "sebagai partikel"
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 msgid "Enable opacity cache"
 msgstr ""
 
-#: src/gui/setup_video.cpp:305
+#: src/gui/setup_video.cpp:306
 msgid "Enable map reduce"
 msgstr ""
 
-#: src/gui/setup_video.cpp:307
-msgid "Show background"
-msgstr "Perlihatkan latar belakang"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
 msgstr "Batas FPS:"
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 msgid "Alt FPS limit: "
 msgstr "batas Alt FPS:"
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
 msgstr "Detil partikel"
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
 msgstr "Tidak ada"
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
 msgstr "Mengubah ke mode Layar penuh"
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
 msgstr "Mengubah ke OpenGL"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Modifikasi resolusi (contoh: 1024x768)"
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr "Masukkan resolusi baru:"
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 msgid "Screen Resolution Changed"
 msgstr "Resolusi layar diubah"
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
 msgstr "Pengaturan efek partikel diubah"
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "Perubahan akan memberikan efek saat pergantian peta."
 
@@ -3184,7 +3190,8 @@ msgid "Change"
 msgstr "Ubah"
 
 #: src/gui/tradewindow.cpp:332
-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 ""
 
 #: src/gui/tradewindow.cpp:377
@@ -3525,7 +3532,8 @@ msgid "Command: /unignore <player>"
 msgstr "perintah: /unignore <nama pemain>"
 
 #: 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 ""
 
 #: src/gui/windowmenu.cpp:65
@@ -4746,50 +4754,4 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr ""
 
-#~ msgid "Strength:"
-#~ msgstr "Kekuatan"
-
-#~ msgid "Vitality:"
-#~ msgstr "Daya/Tenaga Hidup"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Kecerdasan"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Ketangkasan"
-
-#~ msgid "You are already in guild."
-#~ msgstr "Kamu sudah berada di dalam organisasi"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "perintah ini mengundang <nama> untuk menjadi bagian kelompok anda"
-
-#~ msgid "Client too old."
-#~ msgstr "Versi yang digunakan sudah kadaluarsa."
-
-#~ msgid "Server overpopulated."
-#~ msgstr "Server kepenuhan."
-
-#~ msgid "Username permanently erased."
-#~ msgstr "Username dihapus permanen."
-
-#~ msgid "%s has joined your party."
-#~ msgstr "%s telah bergabung dengan kelompok"
-
-#~ msgid "%s can't join your party because party is full."
-#~ msgstr ""
-#~ "%s tidak dapat bergabung dengan kelompok karena kelompok sudah penuh."
-
-#~ msgid "You are carrying less than half your weight. You can regain health."
-#~ msgstr ""
-#~ "Kamu membawa kurang dari setengah jumlah berat maksimal. Darah dapat "
-#~ "beregenerasi."
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Anda tidak dapat melakukannya sekarang"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Tidak dapat menggunakan skill tersebut dengan senjata tersebut"
 
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr "Gagal menambahkan barang. Kamu tidak dapat menukar barang ini."
diff --git a/po/ja.po b/po/ja.po
index 44f40d8b9..176f51314 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-20 03:19+0300\n"
-"PO-Revision-Date: 2011-06-20 00:31+0000\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"PO-Revision-Date: 2011-08-08 01:29+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -20,100 +20,109 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1030
+#: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:517
+#: src/being.cpp:541
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being.cpp:517
+#: src/being.cpp:541
 msgid "miss"
 msgstr "ミス"
 
-#: src/client.cpp:796 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1513
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1518
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:875
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr "サーバー通信中…"
 
-#: src/client.cpp:906
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "ログイン中…"
 
-#: src/client.cpp:939
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr "ゲームの世界に入る中"
 
-#: src/client.cpp:1031
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr "服：％d"
 
-#: src/client.cpp:1062
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr "ゲームサーバー通信中…"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr "サーバーを入り替え中…"
 
-#: src/client.cpp:1109 src/client.cpp:1116 src/client.cpp:1253
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
-#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
-#: src/net/tmwa/charserverhandler.cpp:206
+#: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1125
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr "登録細目を要請中"
 
-#: src/client.cpp:1152
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1153
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr "パスワード変更成功！"
 
-#: src/client.cpp:1172
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr "メール変更"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr "メール変更成功！"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr "登録解除成功"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr "さよなら、いつでも戻ってね..."
 
-#: src/client.cpp:1383 src/client.cpp:1413 src/client.cpp:1457
-#: src/client.cpp:1873
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s は存在しないので作成することが不可能！終了中…"
 
-#: src/client.cpp:1587
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:  %s"
 
-#: src/client.cpp:1621 src/client.cpp:1627
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1648
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー： %s は存在しないので作成することが不可能！終了中…"
@@ -138,7 +147,7 @@ msgstr "%sと言うメッセージタブの作成ができません！それは�
 msgid "Requesting to join channel %s."
 msgstr "%sというチャンネルへの参加を要求しています。"
 
-#: src/commandhandler.cpp:445 src/net/tmwa/gui/partytab.cpp:125
+#: src/commandhandler.cpp:445
 msgid "Party name is missing."
 msgstr "パーティ名がない。"
 
@@ -282,63 +291,63 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"。"
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存することに失敗しました！"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1043
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "他人からのトレードリクエストを無視します。"
 
-#: src/game.cpp:1050
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "他人からのトレードリクエストを受け入れます。"
 
-#: src/game.cpp:1425
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr "マップをロードできませんでした"
 
-#: src/game.cpp:1426
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
 
-#: src/gui/beingpopup.cpp:108
+#: src/gui/beingpopup.cpp:118
 #, c-format
 msgid "Party: %s"
 msgstr "パーティ：%s"
 
-#: src/gui/beingpopup.cpp:122
+#: src/gui/beingpopup.cpp:132
 #, c-format
 msgid "Guild: %s"
 msgstr "ギルド：%s"
 
-#: src/gui/beingpopup.cpp:135
+#: src/gui/beingpopup.cpp:145
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "PVP ランク：%d"
 
-#: src/gui/beingpopup.cpp:146
+#: src/gui/beingpopup.cpp:156
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -352,18 +361,18 @@ msgid "Name"
 msgstr "名前"
 
 #: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
 msgid "Attack"
 msgstr "攻撃"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:275
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "話す"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
 msgid "Move"
 msgstr "動く"
 
@@ -376,9 +385,8 @@ msgid "Reset"
 msgstr "リセット"
 
 #: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
-#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
-#: src/gui/popupmenu.cpp:655
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
+#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
 msgid "Buy"
 msgstr "買う"
 
@@ -406,8 +414,8 @@ msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
-#: src/keyboardconfig.cpp:287
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/keyboardconfig.cpp:290
 msgid "Quit"
 msgstr "終了"
 
@@ -418,30 +426,30 @@ msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:145
+#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
 msgid "Shop"
 msgstr "店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
-#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
+#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "売る"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
-#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
-#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
-#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
-#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
-#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
-#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
+#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
+#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
+#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -480,7 +488,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "パスワードの変更"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "パスワード:"
@@ -511,7 +519,7 @@ msgstr ""
 msgid "Create Character"
 msgstr "キャラクターを作成"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "名前:"
@@ -610,7 +618,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -687,8 +695,8 @@ msgstr "虹 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
 #: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
-#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:166
-#: src/gui/setup_video.cpp:191 src/gui/textcommandeditor.cpp:101
+#: src/gui/setup_theme.cpp:71 src/gui/setup_theme.cpp:125
+#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
@@ -697,12 +705,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "チャット"
 
-#: src/gui/chatwindow.cpp:589
+#: src/gui/chatwindow.cpp:605
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:972
+#: src/gui/chatwindow.cpp:988
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sに送信中： %s"
@@ -716,13 +724,14 @@ msgid "No"
 msgstr "いいえ"
 
 #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
-#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
-#: src/gui/popupmenu.cpp:612
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
+#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
+#: src/gui/popupmenu.cpp:627
 msgid "Ignore"
 msgstr "無視"
 
 #: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/setup_other.cpp:65
 msgid "Map"
 msgstr "地図"
 
@@ -862,8 +871,8 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
+#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
 msgid "Close"
 msgstr "閉じる"
 
@@ -881,7 +890,6 @@ msgstr ""
 
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
-#: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
 msgid "OK"
 msgstr "OK"
 
@@ -889,10 +897,10 @@ msgstr "OK"
 msgid "Equipment"
 msgstr "装備"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
-#: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
-#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
-#: src/gui/popupmenu.cpp:1717
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
+#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
+#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1746
 msgid "Unequip"
 msgstr "外す"
 
@@ -900,80 +908,80 @@ msgstr "外す"
 msgid "Help"
 msgstr "ヘルプ"
 
-#: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "アイテム"
 
-#: src/gui/inventorywindow.cpp:103
+#: src/gui/inventorywindow.cpp:104
 msgid "Slots:"
 msgstr "スロット"
 
-#: src/gui/inventorywindow.cpp:114
+#: src/gui/inventorywindow.cpp:115
 msgid "Filter:"
 msgstr "フィルタ："
 
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
 msgid "Sort:"
 msgstr "類："
 
-#: src/gui/inventorywindow.cpp:121
+#: src/gui/inventorywindow.cpp:122
 msgid "na"
 msgstr "不足"
 
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
 msgid "az"
 msgstr "字母"
 
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
 msgid "id"
 msgstr "id"
 
-#: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
-#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
+#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
 msgid "Equip"
 msgstr "装備する"
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
-#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
-#: src/gui/popupmenu.cpp:1722
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1751
 msgid "Use"
 msgstr "使う"
 
-#: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
-#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
+#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
+#: src/gui/popupmenu.cpp:1755
 msgid "Drop..."
 msgstr "落とす..."
 
-#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
-#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
+#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
+#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
 msgid "Split"
 msgstr "分割する"
 
-#: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:493
+#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:508
 msgid "Outfits"
 msgstr "服"
 
-#: src/gui/inventorywindow.cpp:147
+#: src/gui/inventorywindow.cpp:148
 msgid "Weight:"
 msgstr "重量"
 
-#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
-#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "保存"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
 msgid "Retrieve"
 msgstr "取り戻す"
 
-#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
-#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
+#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
+#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "落とす"
@@ -1121,32 +1129,32 @@ msgstr "オートクローズ"
 msgid "Skip"
 msgstr "スキップ"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "サーバ:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr "カスタム・アップデート・ホスト"
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr "ウザー名を覚える"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr "アップデート"
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "登録する"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr "サーバーを変える"
 
@@ -1203,14 +1211,15 @@ msgid "Submit"
 msgstr "決定"
 
 #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:143
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
 msgid "Clear"
 msgstr "クリア"
 
-#: src/gui/npcdialog.cpp:210
+#: src/gui/npcdialog.cpp:222
 msgid "> Next"
 msgstr "> 次の"
 
@@ -1244,88 +1253,87 @@ msgstr "外す第一"
 msgid "Away outfit"
 msgstr "装備一式不在で"
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
-#: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交換"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
-#: src/gui/popupmenu.cpp:600
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
+#: src/gui/popupmenu.cpp:615
 msgid "Be friend"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
-#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
-#: src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
+#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
 msgid "Disregard"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
-#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
-#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
+#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
+#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
 msgid "Erase"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:632
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
+#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:647
 msgid "Unignore"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
+#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
 #: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "完全無視"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:659
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
-#: src/gui/popupmenu.cpp:645
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:660
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:702
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
-#: src/gui/popupmenu.cpp:687
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:716
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:689
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:718
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:724
 msgid "Invite to guild"
 msgstr ""
 
@@ -1337,213 +1345,223 @@ msgstr ""
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:1903
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
+#: src/gui/popupmenu.cpp:1932
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
-#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:682
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
+#: src/gui/popupmenu.cpp:684
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:292
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: src/gui/popupmenu.cpp:303
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:294
+#: src/gui/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:296
+#: src/gui/popupmenu.cpp:311
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:299
+#: src/gui/popupmenu.cpp:314
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:461
+#: src/gui/popupmenu.cpp:476
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
-#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
+#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
 msgid "Add to chat"
 msgstr "チャットに追加"
 
-#: src/gui/popupmenu.cpp:479
+#: src/gui/popupmenu.cpp:494
 msgid "Map Item"
 msgstr "マップアイテム"
 
-#: src/gui/popupmenu.cpp:480
+#: src/gui/popupmenu.cpp:495
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
-#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
+#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
 msgid "Remove"
 msgstr "取り去る"
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:510
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "呪文"
 
-#: src/gui/popupmenu.cpp:513
+#: src/gui/popupmenu.cpp:528
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:514
+#: src/gui/popupmenu.cpp:529
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:555
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
-#: src/gui/popupmenu.cpp:545
+#: src/gui/popupmenu.cpp:560
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
-#: src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:565
 msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:570
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:575
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
+#: src/gui/popupmenu.cpp:580
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
 msgid "Leave"
 msgstr "でる"
 
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:744
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1137
+#: src/gui/popupmenu.cpp:1166
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1139
+#: src/gui/popupmenu.cpp:1168
 msgid "Name:                    "
 msgstr " 名前:   "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1218
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1220
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1541
+#: src/gui/popupmenu.cpp:1570
 msgid "Add to trade"
 msgstr "に貿易を足す"
 
-#: src/gui/popupmenu.cpp:1547
+#: src/gui/popupmenu.cpp:1576
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1550
+#: src/gui/popupmenu.cpp:1579
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1552
+#: src/gui/popupmenu.cpp:1581
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1564
+#: src/gui/popupmenu.cpp:1593
 msgid "Store 10"
 msgstr "10保存"
 
-#: src/gui/popupmenu.cpp:1567
+#: src/gui/popupmenu.cpp:1596
 msgid "Store half"
 msgstr "半分保存"
 
-#: src/gui/popupmenu.cpp:1569
+#: src/gui/popupmenu.cpp:1598
 msgid "Store all"
 msgstr "全部保存"
 
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
+#: src/gui/popupmenu.cpp:1756
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1608
+#: src/gui/popupmenu.cpp:1637
 msgid "Retrieve 10"
 msgstr "10取る"
 
-#: src/gui/popupmenu.cpp:1611
+#: src/gui/popupmenu.cpp:1640
 msgid "Retrieve half"
 msgstr "半分取る"
 
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1642
 msgid "Retrieve all"
 msgstr "全部取る"
 
-#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
+#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1772
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
 msgid "Hide"
 msgstr " 隠す"
 
-#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
 msgid "Show"
 msgstr "見せる"
 
-#: src/gui/popupmenu.cpp:1817
+#: src/gui/popupmenu.cpp:1846
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1848
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
+#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
+#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
 msgid "Move down"
 msgstr ""
 
@@ -1595,56 +1613,60 @@ msgstr "パスワードが一致していません。"
 msgid "Choose Your Server"
 msgstr "サーバを選ぶ"
 
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "ポート:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr "サーバー形"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr "ロード"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr "通信"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr "カスタムサーバー"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "サーバのアドレスとポート番号を両方入力してください。"
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr "サーバーを待っている..."
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr "ダウンロード準備中..."
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr "要る v%s"
@@ -1697,63 +1719,91 @@ msgstr "新しい音楽をダウンロードする場合は、クライアント
 msgid "Sound Engine"
 msgstr "サウンドエンジン"
 
-#: src/gui/setup_chat.cpp:55
-msgid "Remove colors from received chat messages"
-msgstr ""
+#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr "色彩"
 
-#: src/gui/setup_chat.cpp:58
-msgid "Log magic messages in debug tab"
+#: src/gui/setup_chat.cpp:57
+msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:61
-msgid "Allow magic and GM commands in all chat tabs"
+#: src/gui/setup_chat.cpp:60
+msgid "Show chat colors list"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:64
-msgid "Show server messages in debug tab"
+msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:67
-msgid "Show chat colors list"
+#: src/gui/setup_chat.cpp:66
+msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:70
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:73
+#: src/gui/setup_chat.cpp:75
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:79
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
 msgstr "チャットログを有効"
 
-#: src/gui/setup_chat.cpp:76
-msgid "Limit max lines in chat"
+#: src/gui/setup_chat.cpp:84
+msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
-msgid "Enable trade tab"
+#: src/gui/setup_chat.cpp:88
+msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:82
+#: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:85
-msgid "Show chat history"
+#: src/gui/setup_chat.cpp:94
+msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:96
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:99
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:105
 msgid "Enable battle tab"
 msgstr "バトルタブを有効"
 
-#: src/gui/setup_chat.cpp:91
+#: src/gui/setup_chat.cpp:108
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:111
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:97
+#: src/gui/setup_chat.cpp:115
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
 msgid "Use local time"
 msgstr ""
 
@@ -1761,10 +1811,6 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "これがその色がどのように見えるかです。"
 
-#: src/gui/setup_colors.cpp:54
-msgid "Colors"
-msgstr "色彩"
-
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
 msgstr "タイプ："
@@ -1808,16 +1854,16 @@ msgstr "青"
 msgid "Alpha:"
 msgstr "アルファ："
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "適用"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
-#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
-#: src/gui/setup_players.cpp:332
+#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
+#: src/gui/setup_players.cpp:334
 msgid "Edit"
 msgstr "エディット"
 
@@ -1869,110 +1915,162 @@ msgstr "キーが重複しています。"
 msgid "Misc"
 msgstr "他"
 
-#: src/gui/setup_other.cpp:46
+#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr "モンスター"
+
+#: src/gui/setup_other.cpp:48
 msgid "Show damage inflicted to monsters"
 msgstr "モンスターに与えた損傷を表示する"
 
-#: src/gui/setup_other.cpp:49
-msgid "Enable server side attack"
-msgstr ""
-
-#: src/gui/setup_other.cpp:52
+#: src/gui/setup_other.cpp:51
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:55
-msgid "Auto fix position"
+#: src/gui/setup_other.cpp:54
+msgid "Highlight monster attack range"
 msgstr ""
 
 #: src/gui/setup_other.cpp:58
-msgid "Highlight map portals"
-msgstr ""
+msgid "Show monster hp bar"
+msgstr "モンスターHPバーを表示する"
 
 #: src/gui/setup_other.cpp:61
-msgid "Attack while moving"
-msgstr ""
-
-#: src/gui/setup_other.cpp:64
-msgid "Highlight floor items"
+msgid "Cycle monster targets"
 msgstr ""
 
 #: src/gui/setup_other.cpp:67
-msgid "Enable quick stats"
+msgid "Show warps particles"
 msgstr ""
 
 #: src/gui/setup_other.cpp:70
-msgid "Highlight player attack range"
+msgid "Highlight map portals"
 msgstr ""
 
 #: src/gui/setup_other.cpp:73
-msgid "Show warps particles"
+msgid "Highlight floor items"
 msgstr ""
 
 #: src/gui/setup_other.cpp:76
-msgid "Highlight monster attack range"
+msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:80
-msgid "Accept sell/buy requests"
+#: src/gui/setup_other.cpp:79
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:83
-msgid "Cycle player targets"
-msgstr ""
+#: src/gui/setup_other.cpp:82
+msgid "Draw path"
+msgstr "パスを描画"
 
-#: src/gui/setup_other.cpp:86
-msgid "Show monster hp bar"
-msgstr "モンスターHPバーを表示する"
+#: src/gui/setup_other.cpp:85
+msgid "Draw hotkeys on map"
+msgstr ""
 
 #: src/gui/setup_other.cpp:89
-msgid "Cycle monster targets"
+msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:92
-msgid "Show own hp bar"
-msgstr "自分のHPバーを表示する"
+#: src/gui/setup_other.cpp:91
+msgid "Auto fix position"
+msgstr ""
 
-#: src/gui/setup_other.cpp:95
-msgid "Enable bot checker"
+#: src/gui/setup_other.cpp:94
+msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:98
-msgid "Show job exp messages"
+#: src/gui/setup_other.cpp:97
+msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:100
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
-msgid "Show players popups"
+#: src/gui/setup_other.cpp:104
+msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
-msgid "Show extended minimaps"
+#: src/gui/setup_other.cpp:106
+msgid "Show own hp bar"
+msgstr "自分のHPバーを表示する"
+
+#: src/gui/setup_other.cpp:109
+msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:112
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:115
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:118
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:124
+msgid "Show job"
+msgstr "仕事を表示する"
+
+#: src/gui/setup_other.cpp:127
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:130
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:136
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:139
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:145
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:149
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
 msgid "Enable buggy servers protection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:160
 msgid "Enable debug log"
 msgstr "デバッグループを有効にする"
 
+#: src/gui/setup_other.cpp:163
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr "背景を表示する"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "関係"
@@ -2017,299 +2115,283 @@ msgstr "プライベートメッセージをタブに出す。"
 msgid "Show gender"
 msgstr "性的を表示する"
 
-#: src/gui/setup_players.cpp:265
+#: src/gui/setup_players.cpp:267
 msgid "Players"
 msgstr "プレイヤー"
 
-#: src/gui/setup_players.cpp:290
+#: src/gui/setup_players.cpp:292
 msgid "When ignoring:"
 msgstr "無視の際には："
 
-#: src/gui/setup_players.cpp:313
+#: src/gui/setup_players.cpp:315
 msgid "Show level"
 msgstr "レベルを表示する"
 
-#: src/gui/setup_players.cpp:317
+#: src/gui/setup_players.cpp:319
 msgid "Show own name"
 msgstr "自分の名前を表示する"
 
-#: src/gui/setup_players.cpp:321
+#: src/gui/setup_players.cpp:323
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:325
+#: src/gui/setup_players.cpp:327
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+#: src/gui/setup_players.cpp:331 src/gui/setup_players.cpp:523
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_players.cpp:336
+msgid "Visible names"
+msgstr "名前を表示する"
+
+#: src/gui/setup_players.cpp:341
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:105
+msgid "Tiny (10)"
+msgstr "小さい (10)"
+
+#: src/gui/setup_theme.cpp:106
+msgid "Small (11)"
+msgstr "小（11）"
+
+#: src/gui/setup_theme.cpp:107
+msgid "Medium (12)"
+msgstr "媒体（12）"
+
+#: src/gui/setup_theme.cpp:108
+msgid "Large (13)"
+msgstr "大（13）"
+
+#: src/gui/setup_theme.cpp:109
+msgid "Big (14)"
+msgstr "ビッグ（14）"
+
+#: src/gui/setup_theme.cpp:110
+msgid "Huge (15)"
+msgstr "巨大（15）"
+
+#: src/gui/setup_theme.cpp:140
 msgid "Theme"
 msgstr "テーマ"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:142
 msgid "Gui theme"
 msgstr "GUIテーマ"
 
-#: src/gui/setup_theme.cpp:114
+#: src/gui/setup_theme.cpp:143
 msgid "Main Font"
 msgstr "メインフォント"
 
-#: src/gui/setup_theme.cpp:115
+#: src/gui/setup_theme.cpp:144
 msgid "Bold font"
 msgstr "太字フォント"
 
-#: src/gui/setup_theme.cpp:116
+#: src/gui/setup_theme.cpp:145
 msgid "Particle font"
 msgstr "粒子のフォント"
 
-#: src/gui/setup_theme.cpp:117
+#: src/gui/setup_theme.cpp:146
 msgid "Help font"
 msgstr "ヘルプフォント"
 
-#: src/gui/setup_theme.cpp:118
+#: src/gui/setup_theme.cpp:147
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:241
+#: src/gui/setup_theme.cpp:175
+msgid "Font size"
+msgstr "フォントサイズ"
+
+#: src/gui/setup_theme.cpp:281
 msgid "Theme Changed"
 msgstr "テーマは変えました"
 
-#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:722
-#: src/gui/setup_video.cpp:727
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更のため、アプリケーションを再起動してください。"
 
-#: src/gui/setup_video.cpp:146
-msgid "Tiny (10)"
-msgstr "小さい (10)"
-
-#: src/gui/setup_video.cpp:147
-msgid "Small (11)"
-msgstr "小（11）"
-
-#: src/gui/setup_video.cpp:148
-msgid "Medium (12)"
-msgstr "媒体（12）"
-
-#: src/gui/setup_video.cpp:149
-msgid "Large (13)"
-msgstr "大（13）"
-
-#: src/gui/setup_video.cpp:150
-msgid "Big (14)"
-msgstr "ビッグ（14）"
-
-#: src/gui/setup_video.cpp:151
-msgid "Huge (15)"
-msgstr "巨大（15）"
-
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:194
 msgid "Software"
 msgstr "ソフトウェア"
 
-#: src/gui/setup_video.cpp:175
+#: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
 msgstr "速い OpenGL"
 
-#: src/gui/setup_video.cpp:176
+#: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
 msgstr "セーフ OpenGL"
 
-#: src/gui/setup_video.cpp:203
+#: src/gui/setup_video.cpp:223
 msgid "No text"
 msgstr "テキストなし"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:225
 msgid "Text"
 msgstr "テキスト"
 
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
 msgstr "バブル、名前表示なし"
 
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
 msgstr "バブル、名前表示あり"
 
-#: src/gui/setup_video.cpp:222
+#: src/gui/setup_video.cpp:242
 msgid "off"
 msgstr "オフ"
 
-#: src/gui/setup_video.cpp:224 src/gui/setup_video.cpp:241
+#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:226 src/gui/setup_video.cpp:245
+#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:243
+#: src/gui/setup_video.cpp:263
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:247
+#: src/gui/setup_video.cpp:267
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:279
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "フールスクリーン"
 
-#: src/gui/setup_video.cpp:280
+#: src/gui/setup_video.cpp:294
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_video.cpp:281
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "カスタムカーソル"
 
-#: src/gui/setup_video.cpp:283
-msgid "Visible names"
-msgstr "名前を表示する"
-
-#: src/gui/setup_video.cpp:285
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "粒子効果"
 
-#: src/gui/setup_video.cpp:287
-msgid "Log NPC dialogue"
-msgstr ""
-
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "ピックアップ通知表示"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:290
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "チャット中"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "画面内で"
 
-#: src/gui/setup_video.cpp:294
-msgid "Hide shield sprite"
-msgstr ""
-
-#: src/gui/setup_video.cpp:296
-msgid "Low traffic mode"
+#: src/gui/setup_video.cpp:305
+msgid "Enable opacity cache"
 msgstr ""
 
-#: src/gui/setup_video.cpp:298
-msgid "Sync player move"
+#: src/gui/setup_video.cpp:306
+msgid "Enable map reduce"
 msgstr ""
 
-#: src/gui/setup_video.cpp:300
-msgid "Draw hotkeys on map"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "Draw path"
-msgstr "パスを描画"
-
-#: src/gui/setup_video.cpp:303
-msgid "Show job"
-msgstr "仕事を表示する"
-
-#: src/gui/setup_video.cpp:304
-msgid "Enable opacity cache"
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_video.cpp:305
-msgid "Show background"
-msgstr "背景を表示する"
-
-#: src/gui/setup_video.cpp:310
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
 msgstr "FPSリミット"
 
-#: src/gui/setup_video.cpp:314 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:653 src/gui/setup_video.cpp:817
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/gui/setup_video.cpp:329
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "ヘッダーテキスト"
 
-#: src/gui/setup_video.cpp:330
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "GUI不透明"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "環境FX"
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
 msgstr "粒子の詳細"
 
-#: src/gui/setup_video.cpp:333
-msgid "Font size"
-msgstr "フォントサイズ"
-
-#: src/gui/setup_video.cpp:352 src/gui/setup_video.cpp:355
-#: src/gui/setup_video.cpp:652 src/gui/setup_video.cpp:804
-#: src/gui/setup_video.cpp:815
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
 msgstr "なし"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "ウインドウモードでも前のモードの復元もまた失敗しました！"
 
-#: src/gui/setup_video.cpp:541
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "フルスクリーンモードでも前のモードの復元もまた失敗しました！"
 
-#: src/gui/setup_video.cpp:552
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
 msgstr "フルスクリーンに変更"
 
-#: src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更のため、再起動をしてください。"
 
-#: src/gui/setup_video.cpp:565
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
 msgstr "OpenGLに変更"
 
-#: src/gui/setup_video.cpp:566
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGLの設定を変更するため、再起動をしてください。"
 
-#: src/gui/setup_video.cpp:705
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr "カスタム解像度（例：1024 × 768）"
 
-#: src/gui/setup_video.cpp:706
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:721 src/gui/setup_video.cpp:726
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 msgid "Screen Resolution Changed"
 msgstr "スクリーンの解像度が変わりました。"
 
-#: src/gui/setup_video.cpp:724
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:758
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:759
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "変化はマップがかわったときから影響します。"
 
@@ -2326,7 +2408,7 @@ msgid "Sell items"
 msgstr "商品を売る"
 
 #: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:92
+#: src/gui/tradewindow.cpp:88
 msgid "Add"
 msgstr "追加"
 
@@ -2339,7 +2421,6 @@ msgid "Show links in announce"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
-#: src/net/tmwa/tradehandler.cpp:124
 msgid "Request for Trade"
 msgstr "取引要求"
 
@@ -2348,40 +2429,40 @@ msgstr "取引要求"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:243 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "スキル"
 
-#: src/gui/skilldialog.cpp:254
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
 msgstr "上げる"
 
-#: src/gui/skilldialog.cpp:307
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
-#: src/gui/skilldialog.cpp:383
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
-#: src/gui/skilldialog.cpp:395
+#: src/gui/skilldialog.cpp:425
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
 
-#: src/gui/skilldialog.cpp:459 src/gui/skilldialog.cpp:512
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
-#: src/gui/skilldialog.cpp:504
+#: src/gui/skilldialog.cpp:537
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Lvl：%d (%+d)"
 
-#: src/gui/socialwindow.cpp:117 src/net/tmwa/gui/guildtab.cpp:50
+#: src/gui/socialwindow.cpp:117
 msgid "Guild"
 msgstr "ギルド"
 
@@ -2413,7 +2494,7 @@ msgstr "ギルドを残す？"
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/tmwa/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:215
 msgid "Party"
 msgstr "パーティー"
 
@@ -3094,25 +3175,25 @@ msgstr "了承しました。待っています…。"
 msgid "Trade: You"
 msgstr "交換:あなたと"
 
-#: src/gui/tradewindow.cpp:114 src/gui/tradewindow.cpp:170
+#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
 #, c-format
 msgid "You get %s"
 msgstr "%sを手に入れた"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:111
 msgid "You give:"
 msgstr "あげる物:"
 
-#: src/gui/tradewindow.cpp:119
+#: src/gui/tradewindow.cpp:115
 msgid "Change"
 msgstr "変更"
 
-#: src/gui/tradewindow.cpp:336
+#: src/gui/tradewindow.cpp:332
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重複して追加することは出来ません！"
 
-#: src/gui/tradewindow.cpp:381
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "現金不足です。"
 
@@ -3133,21 +3214,21 @@ msgstr "接続しています..."
 msgid "Play"
 msgstr "プレイ"
 
-#: src/gui/updatewindow.cpp:547
+#: src/gui/updatewindow.cpp:556
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:549
+#: src/gui/updatewindow.cpp:558
 msgid "##1  It is strongly recommended that"
 msgstr "##1 とても推奨されます。"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:551
+#: src/gui/updatewindow.cpp:560
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:677
+#: src/gui/updatewindow.cpp:686
 msgid "Completed"
 msgstr "完了"
 
@@ -3187,10 +3268,6 @@ msgstr "ゲームマスター名"
 msgid "NPCs"
 msgstr "NPCたち"
 
-#: src/gui/userpalette.cpp:125
-msgid "Monsters"
-msgstr "モンスター"
-
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
 msgstr "モンスターのHPバー"
@@ -3384,7 +3461,6 @@ msgid "This command makes <nick> a channel operator."
 msgstr "このコマンドでは、入力したユーザーをチャンネルのオペレータとなる"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/tmwa/gui/guildtab.cpp:91 src/net/tmwa/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で囲んでください。"
 
@@ -3661,7 +3737,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
 #: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:357
+#: src/keyboardconfig.cpp:360
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "アイテムショートカット: %d"
@@ -3776,7 +3852,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
 #: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
 #: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:355
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "スマイリーショートカット: %d"
@@ -3813,198 +3889,202 @@ msgstr "前のチャットタブ"
 msgid "Next Chat Tab"
 msgstr "次のチャットタブ"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:278
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:282
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:284
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:286
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:288
 msgid "Select OK"
 msgstr "OKを選択する"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:291
 msgid "Ignore input 1"
 msgstr "インプット１無視"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:293
 msgid "Ignore input 2"
 msgstr "インプット２無視"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:295
 msgid "Direct Up"
 msgstr "方向上"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:296
 msgid "Direct Down"
 msgstr "方向下"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:298
 msgid "Direct Left"
 msgstr "方向 左"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:299
 msgid "Direct Right"
 msgstr "方向右"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:301
 msgid "Crazy moves"
 msgstr "クレイジーに移動"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:303
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:305
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:307
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:309
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:311
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:313
 msgid "Use #itenplz spell"
 msgstr "#itenplz は呪文を使う"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:315
 msgid "Use magic attack"
 msgstr "魔法攻撃を使用"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:317
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:319
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:321
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:323
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:325
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:327
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:330
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:331
 msgid "On / Off audio"
 msgstr "アウディオ　オン/オフ"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:333
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:335
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:337
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:339
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:408
+#: src/keyboardconfig.cpp:411
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:344
+#: src/localplayer.cpp:371
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1402
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1404
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1406
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1408
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1410
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1413
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1416
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1440
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3174
 msgid "Away"
 msgstr "去って"
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3478
 msgid "Follow: "
 msgstr "従う: "
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3487
 msgid "Imitation: "
 msgstr "擬い: "
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3849
 msgid "You see "
 msgstr "あなた"
 
@@ -4112,7 +4192,7 @@ msgstr "買ってくださり、ありがとうございました。"
 msgid "Unable to buy."
 msgstr "購買不可能"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
 msgid "Strength"
 msgstr "強さ"
 
@@ -4121,7 +4201,7 @@ msgstr "強さ"
 msgid "Strength %+.1f"
 msgstr "強度 (str) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
 msgid "Agility"
 msgstr "素早さ"
 
@@ -4130,7 +4210,7 @@ msgstr "素早さ"
 msgid "Agility %+.1f"
 msgstr "機敏さ (agi) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
 msgid "Dexterity"
 msgstr "器用さ"
 
@@ -4139,7 +4219,7 @@ msgstr "器用さ"
 msgid "Dexterity %+.1f"
 msgstr "器用さ (dex) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
 msgid "Vitality"
 msgstr "活力"
 
@@ -4148,7 +4228,7 @@ msgstr "活力"
 msgid "Vitality %+.1f"
 msgstr "活気 (vit) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
 msgid "Intelligence"
 msgstr "知能"
 
@@ -4166,59 +4246,59 @@ msgstr "気力"
 msgid "Willpower %+.1f"
 msgstr "意地 (wil) %+.1f"
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:103
+#: src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "あなたは死にました。"
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:104
+#: src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "残念なお知らせですが、あなた様のキャラは戦闘中亡くなってしまいました。"
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:106
+#: src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "今から生きていない。"
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:107
+#: src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "死神の冷たい手に魂が取られてしまった。"
 
-#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:108
+#: src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "ゲームオーバー!"
 
-#: src/net/manaserv/beinghandler.cpp:321 src/net/tmwa/playerhandler.cpp:110
+#: src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに向かっただけ。"
 
-#: src/net/manaserv/beinghandler.cpp:323 src/net/tmwa/playerhandler.cpp:112
+#: src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "喉で的の武器を潰す予定だったが…失敗した。"
 
-#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:114
+#: src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "あんまり上手くいかなかったぜー"
 
-#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:116
+#: src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "持ち物を確定して欲しい？"
 
-#: src/net/manaserv/beinghandler.cpp:327 src/net/tmwa/playerhandler.cpp:118
+#: src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "悲しさのあまり、痕跡でさえ見つからなかった。"
 
-#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:120
+#: src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "全滅された。"
 
-#: src/net/manaserv/beinghandler.cpp:330 src/net/tmwa/playerhandler.cpp:122
+#: src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "相手から自分の頭が渡されたみたい。"
 
-#: src/net/manaserv/beinghandler.cpp:332 src/net/tmwa/playerhandler.cpp:124
+#: src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "もう一回倒された、水道管から死体を這ってみた後、新体を受け取ってみて"
@@ -4279,11 +4359,10 @@ msgstr "無効場所の号"
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
-#: src/net/tmwa/loginhandler.cpp:102 src/net/tmwa/loginhandler.cpp:202
 msgid "Unknown error."
 msgstr "不明エラー"
 
-#: src/net/manaserv/charhandler.cpp:210 src/net/tmwa/charserverhandler.cpp:201
+#: src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "情報"
 
@@ -4350,7 +4429,7 @@ msgstr "%s は％を蹴った %s"
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85 src/net/tmwa/guildhandler.cpp:107
+#: src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
 msgstr "ギルド作成成功"
 
@@ -4386,7 +4465,7 @@ msgstr ""
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:127 src/net/tmwa/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
@@ -4465,7 +4544,7 @@ msgstr "取引要求を受け取り中"
 msgid "Ignoring incoming trade requests."
 msgstr "取引要求を無視にしている。"
 
-#: src/net/manaserv/tradehandler.cpp:128 src/net/tmwa/tradehandler.cpp:125
+#: src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%sはあなたと取引したいみたいが、応じる？"
@@ -4475,11 +4554,11 @@ msgstr "%sはあなたと取引したいみたいが、応じる？"
 msgid "Trading with %s"
 msgstr "%sと取引中"
 
-#: src/net/manaserv/tradehandler.cpp:160 src/net/tmwa/tradehandler.cpp:282
+#: src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "取引中止"
 
-#: src/net/manaserv/tradehandler.cpp:167 src/net/tmwa/tradehandler.cpp:292
+#: src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "取引完了"
 
@@ -4491,521 +4570,127 @@ msgstr "キック失敗"
 msgid "Kick succeeded!"
 msgstr "キック成功"
 
-#: src/net/tmwa/buysellhandler.cpp:131
+#: src/net/tmwa/buysellhandler.cpp:133
 msgid "Thanks for selling."
 msgstr "売ってくださり、ありがとうございました。"
 
-#: src/net/tmwa/buysellhandler.cpp:135
+#: src/net/tmwa/buysellhandler.cpp:137
 msgid "Unable to sell."
 msgstr "売ること不可能"
 
-#: src/net/tmwa/buysellhandler.cpp:138
+#: src/net/tmwa/buysellhandler.cpp:140
 msgid "Unable to sell while trading."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:141
+#: src/net/tmwa/buysellhandler.cpp:143
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:121
-msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
-
-#: src/net/tmwa/charserverhandler.cpp:125
-msgid "Cannot use this ID."
-msgstr "ID使用不可能。"
-
-#: src/net/tmwa/charserverhandler.cpp:128
-msgid "Unknown char-server failure."
-msgstr ""
-
-#: src/net/tmwa/charserverhandler.cpp:174
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "キャラクター作成失敗。本名はのう使われている。"
-
-#: src/net/tmwa/charserverhandler.cpp:178 src/net/tmwa/loginhandler.cpp:196
-msgid "Wrong name."
-msgstr "名前間違い"
-
-#: src/net/tmwa/charserverhandler.cpp:181
-msgid "Incorrect stats."
-msgstr "不適切な統計。"
-
-#: src/net/tmwa/charserverhandler.cpp:184
-msgid "Incorrect hair."
-msgstr "不適切な髪。"
-
-#: src/net/tmwa/charserverhandler.cpp:187
-msgid "Incorrect slot."
-msgstr "不適切なスロット。"
-
-#: src/net/tmwa/charserverhandler.cpp:201
-msgid "Character deleted."
-msgstr "キャラクターを削除した。"
-
-#: src/net/tmwa/charserverhandler.cpp:206
-msgid "Failed to delete character."
-msgstr "キャラ削除失敗"
-
-#: src/net/tmwa/charserverhandler.cpp:383
-msgid "Strength:"
-msgstr "筋力:"
-
-#: src/net/tmwa/charserverhandler.cpp:384
-msgid "Agility:"
-msgstr "素早さ:"
-
-#: src/net/tmwa/charserverhandler.cpp:385
-msgid "Vitality:"
-msgstr "体力:"
-
-#: src/net/tmwa/charserverhandler.cpp:386
-msgid "Intelligence:"
-msgstr "知性:"
-
-#: src/net/tmwa/charserverhandler.cpp:387
-msgid "Dexterity:"
-msgstr "敏捷:"
-
-#: src/net/tmwa/charserverhandler.cpp:388
-msgid "Luck:"
-msgstr "運:"
-
-#: src/net/tmwa/chathandler.cpp:106
-#, c-format
-msgid "Whisper could not be sent, %s is offline."
-msgstr ""
-
-#: src/net/tmwa/chathandler.cpp:114
-#, c-format
-msgid "Whisper could not be sent, ignored by %s."
-msgstr ""
-
-#: src/net/tmwa/chathandler.cpp:338
-msgid "MVP player."
-msgstr "プレイヤー MVP"
-
-#: src/net/tmwa/chathandler.cpp:342
-msgid "MVP player: "
-msgstr "プレイヤー MVP "
-
-#: src/net/tmwa/chathandler.cpp:395 src/net/tmwa/chathandler.cpp:401
-#: src/net/tmwa/chathandler.cpp:406 src/net/tmwa/chathandler.cpp:412
-#: src/net/tmwa/chathandler.cpp:417 src/net/tmwa/chathandler.cpp:423
-#: src/net/tmwa/chathandler.cpp:430 src/net/tmwa/chathandler.cpp:436
-msgid "Channels are not supported!"
-msgstr "チャンネルはサポートされていない。"
-
-#: src/net/tmwa/gamehandler.cpp:96
-#, c-format
-msgid "Online users: %d"
-msgstr "オンラインユーザー：%d"
-
-#: src/net/tmwa/gamehandler.cpp:106
-msgid "Game"
-msgstr "ゲーム"
-
-#: src/net/tmwa/gamehandler.cpp:106
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Strength %+d"
 msgstr "強さ %+d"
 
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Agility %+d"
 msgstr "俊敏さ%+d"
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Vitality %+d"
 msgstr "活力 %+d"
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Intelligence %+d"
 msgstr "知能 %+d"
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Dexterity %+d"
 msgstr "正確さ %+d"
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:114
 #, c-format
 msgid "Luck %+d"
 msgstr "運 %+d"
 
-#: src/net/tmwa/generalhandler.cpp:138
+#: src/net/tmwa/generalhandler.cpp:140
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: src/net/tmwa/generalhandler.cpp:141
+#: src/net/tmwa/generalhandler.cpp:143
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: src/net/tmwa/generalhandler.cpp:150
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:151
+#: src/net/tmwa/generalhandler.cpp:153
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:154
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Duplicated login."
 msgstr "重複しログイン。"
 
-#: src/net/tmwa/generalhandler.cpp:157
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
+#: src/net/tmwa/generalhandler.cpp:232
 msgid "Got disconnected from server!"
 msgstr "サーバーから切断された。"
 
-#: src/net/tmwa/generalhandler.cpp:262
+#: src/net/tmwa/generalhandler.cpp:264
 msgid "Luck"
 msgstr "運"
 
-#: src/net/tmwa/generalhandler.cpp:265
+#: src/net/tmwa/generalhandler.cpp:267
 msgid "Defense"
 msgstr "防御"
 
-#: src/net/tmwa/generalhandler.cpp:266
+#: src/net/tmwa/generalhandler.cpp:268
 msgid "M.Attack"
 msgstr "特攻撃"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:269
 msgid "M.Defense"
 msgstr "特防御"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
 msgid "% Accuracy"
 msgstr "％ 精度"
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
 msgid "% Evade"
 msgstr "％ 回避"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:275
+#, no-c-format
 msgid "% Critical"
 msgstr "% 危機"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:276
 msgid "Attack Delay"
 msgstr "攻撃遅延"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:278
 msgid "Walk Delay"
 msgstr " 徒歩遅延"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:280
 msgid "Attack Range"
 msgstr "攻撃距離"
 
-#: src/net/tmwa/gui/guildtab.cpp:77 src/net/tmwa/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/helpでこのヘルプを表示する。"
-
-#: src/net/tmwa/gui/guildtab.cpp:78
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#: src/net/tmwa/gui/guildtab.cpp:79
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#: src/net/tmwa/gui/guildtab.cpp:80
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
-
-#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "コマンド: /invite ＜プレイヤー名＞"
-
-#: src/net/tmwa/gui/guildtab.cpp:90
-msgid "This command invites <nick> to the guild you're in."
-msgstr "このコマンドでは、入力したプレイヤーを自分のギルドに招待します。"
-
-#: src/net/tmwa/gui/guildtab.cpp:96 src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "コマンド: /leave"
-
-#: src/net/tmwa/gui/guildtab.cpp:97
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:112 src/net/tmwa/guildhandler.cpp:117
-msgid "You are already in guild."
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:122
-msgid "Emperium check failed."
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:127
-msgid "Unknown server response."
-msgstr "不明なサーバーの応答。"
-
-#: src/net/tmwa/guildhandler.cpp:205
-#, c-format
-msgid "Guild name: %s"
-msgstr "ギルド名：%s"
-
-#: src/net/tmwa/guildhandler.cpp:207
-#, c-format
-msgid "Guild master: %s"
-msgstr "ギルドマスタ： %s"
-
-#: src/net/tmwa/guildhandler.cpp:209
-#, c-format
-msgid "Guild level: %d"
-msgstr "ギルドレベル：%d"
-
-#: src/net/tmwa/guildhandler.cpp:211
-#, c-format
-msgid "Online members: %d"
-msgstr "オンラインウザー： %d"
-
-#: src/net/tmwa/guildhandler.cpp:213
-#, c-format
-msgid "Max members: %d"
-msgstr "最大のメンバー： %d"
-
-#: src/net/tmwa/guildhandler.cpp:215
-#, c-format
-msgid "Average level: %d"
-msgstr "平均レベル： %d"
-
-#: src/net/tmwa/guildhandler.cpp:217
-#, c-format
-msgid "Guild exp: %d"
-msgstr "ギルド経験：%d"
-
-#: src/net/tmwa/guildhandler.cpp:219
-#, c-format
-msgid "Guild next exp: %d"
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:221
-#, c-format
-msgid "Guild castle: %s"
-msgstr "ギルド城：%s"
-
-#: src/net/tmwa/guildhandler.cpp:436
-msgid "Could not inivte user to guild."
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:441
-msgid "User rejected guild invite."
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:446
-msgid "User is now part of your guild."
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:451
-msgid "Your guild is full."
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:456
-msgid "Unknown guild invite response."
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:478
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:492
-#, c-format
-msgid "%s has left your guild."
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:524
-msgid "You was kicked from guild."
-msgstr ""
-
-#: src/net/tmwa/guildhandler.cpp:538
-#, c-format
-msgid "%s has kicked from your guild."
-msgstr ""
-
-#: src/net/tmwa/gui/partytab.cpp:70
-msgid "/invite > Invite a player to your party"
-msgstr "/inviteでパーティにプレーヤーを招待する。"
-
-#: src/net/tmwa/gui/partytab.cpp:71
-msgid "/leave > Leave the party you are in"
-msgstr "/leaveで既存のパーティから離れる。"
-
-#: src/net/tmwa/gui/partytab.cpp:72
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kickで既存のパーティから一人を追い出してみる。"
-
-#: src/net/tmwa/gui/partytab.cpp:73
-msgid "/item > Show/change party item sharing options"
-msgstr "/item でパーティ内のアイテムシェアモードを表示および変更する。"
-
-#: src/net/tmwa/gui/partytab.cpp:74
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp でパーティ内の経験分割モードを表示および変更する。"
-
-#: src/net/tmwa/gui/partytab.cpp:84
-msgid "This command invites <nick> to party with you."
-msgstr "このコマンドでは、入力したプレイヤーを自分のパーティーに招待します。"
-
-#: src/net/tmwa/gui/partytab.cpp:91
-msgid "This command causes the player to leave the party."
-msgstr "本コマンドではパティからプレイヤーを追い出させる。"
-
-#: src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /item <policy>"
-msgstr "コマンド: /item <ポリシ>"
-
-#: src/net/tmwa/gui/partytab.cpp:97
-msgid "This command changes the party's item sharing policy."
-msgstr "本コマンドでは、アイテム共有モードを変更する。"
-
-#: src/net/tmwa/gui/partytab.cpp:98
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
-msgstr ""
-"＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にするために、「0」、「no」か「false」を設定ください。"
-
-#: src/net/tmwa/gui/partytab.cpp:101
-msgid "Command: /item"
-msgstr "コマンド: /item"
-
-#: src/net/tmwa/gui/partytab.cpp:102
-msgid "This command displays the party's current item sharing policy."
-msgstr "本コマンドでは、アイテム共有モードを表示する。"
-
-#: src/net/tmwa/gui/partytab.cpp:107
-msgid "Command: /exp <policy>"
-msgstr "コマンド: /exp <ポリシ>"
-
-#: src/net/tmwa/gui/partytab.cpp:108
-msgid "This command changes the party's experience sharing policy."
-msgstr "本コマンドでは、経験分割モードを変更する。"
-
-#: src/net/tmwa/gui/partytab.cpp:110
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
-"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にする場合、「0」、「no」か「false」を設定ください。"
-
-#: src/net/tmwa/gui/partytab.cpp:113
-msgid "Command: /exp"
-msgstr "コマンド: /exp"
-
-#: src/net/tmwa/gui/partytab.cpp:114
-msgid "This command displays the party's current experience sharing policy."
-msgstr "本コマンドでは、パーティメンバー以内の経験分割方針を表示する。"
-
-#: src/net/tmwa/gui/partytab.cpp:148 src/net/tmwa/partyhandler.cpp:289
-msgid "Item sharing enabled."
-msgstr "アイテムシェア有効"
-
-#: src/net/tmwa/gui/partytab.cpp:151 src/net/tmwa/partyhandler.cpp:299
-msgid "Item sharing disabled."
-msgstr "アイテムシェア無効"
-
-#: src/net/tmwa/gui/partytab.cpp:154 src/net/tmwa/partyhandler.cpp:309
-msgid "Item sharing not possible."
-msgstr "アイテムシェア不可能"
-
-#: src/net/tmwa/gui/partytab.cpp:157
-msgid "Item sharing unknown."
-msgstr "アイテムシェア不明"
-
-#: src/net/tmwa/gui/partytab.cpp:187 src/net/tmwa/partyhandler.cpp:251
-msgid "Experience sharing enabled."
-msgstr "経験シェア有効"
-
-#: src/net/tmwa/gui/partytab.cpp:190 src/net/tmwa/partyhandler.cpp:261
-msgid "Experience sharing disabled."
-msgstr "経験シェア無効"
-
-#: src/net/tmwa/gui/partytab.cpp:193 src/net/tmwa/partyhandler.cpp:271
-msgid "Experience sharing not possible."
-msgstr "経験シェア不可能"
-
-#: src/net/tmwa/gui/partytab.cpp:196
-msgid "Experience sharing unknown."
-msgstr "経験シェア不明"
-
-#: src/net/tmwa/inventoryhandler.cpp:379
-msgid "Failed to use item."
-msgstr "アイテム使用失敗"
-
-#: src/net/tmwa/inventoryhandler.cpp:531
-msgid "Unable to equip."
-msgstr "装備不可能"
-
-#: src/net/tmwa/loginhandler.cpp:93
-msgid "Account was not found. Please re-login."
-msgstr "アカウントが見つからなかった。再ログインをください。"
-
-#: src/net/tmwa/loginhandler.cpp:99
-msgid "New password too short."
-msgstr "新パスワードは短い過ぎます。"
-
-#: src/net/tmwa/loginhandler.cpp:164
-msgid "Unregistered ID."
-msgstr "未登録なID。"
-
-#: src/net/tmwa/loginhandler.cpp:167
-msgid "Wrong password."
-msgstr "入力したパスワードは間違っています。"
-
-#: src/net/tmwa/loginhandler.cpp:170
-msgid "Account expired."
-msgstr "アカウントの有効期限が切られた。"
-
-#: src/net/tmwa/loginhandler.cpp:173
-msgid "Rejected from server."
-msgstr ""
-
-#: src/net/tmwa/loginhandler.cpp:176
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-
-#: src/net/tmwa/loginhandler.cpp:180
-msgid "Client too old."
-msgstr ""
-
-#: src/net/tmwa/loginhandler.cpp:183
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
-msgstr ""
-"あなたは%sまでゲームからバーンされた。\n"
-"ゲームマスターたちにご連絡ください。"
-
-#: src/net/tmwa/loginhandler.cpp:190
-msgid "Server overpopulated."
-msgstr ""
-
-#: src/net/tmwa/loginhandler.cpp:193
-msgid "This user name is already taken."
-msgstr "ユーザ名はもう使われている。"
-
-#: src/net/tmwa/loginhandler.cpp:199
-msgid "Username permanently erased."
-msgstr ""
-
 #: src/net/tmwa/network.cpp:152
 msgid "Empty address given to Network::connect()!"
 msgstr ""
@@ -5018,276 +4703,11 @@ msgstr "ホスト名を解決できません。"
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:86
-msgid "Could not create party."
-msgstr "パーティ作成失敗"
-
-#: src/net/tmwa/partyhandler.cpp:88
-msgid "Party successfully created."
-msgstr "パーティ作成成功"
-
-#: src/net/tmwa/partyhandler.cpp:143
-#, c-format
-msgid "%s has joined your party."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:179
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%sはもうパーティのメンバーである。"
-
-#: src/net/tmwa/partyhandler.cpp:184
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%sは招待を拒んだ。"
-
-#: src/net/tmwa/partyhandler.cpp:189
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%sは今からパーティのメンバーになった。"
-
-#: src/net/tmwa/partyhandler.cpp:194
-#, c-format
-msgid "%s can't join your party because party is full."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:199
-#, c-format
-msgid "QQQ Unknown invite response for %s."
-msgstr ""
-
-#: src/net/tmwa/partyhandler.cpp:359
-msgid "You have left the party."
-msgstr "パーティから離れた。"
-
-#: src/net/tmwa/partyhandler.cpp:371
-#, c-format
-msgid "%s has left your party."
-msgstr "%sがパーティから離れた。"
-
-#: src/net/tmwa/partyhandler.cpp:447
-#, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "不明なメンバーが言おうとした事: %s"
-
-#: src/net/tmwa/partyhandler.cpp:529
+#: src/net/tmwa/partyhandler.cpp:171
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%sはパーティにはいない！"
 
-#: src/net/tmwa/playerhandler.cpp:109
-msgid "Insert coin to continue."
-msgstr "ゲームを続けるためにはコインを入れてください。"
-
-#: src/net/tmwa/playerhandler.cpp:127
-msgid "You're not dead yet. You're just resting."
-msgstr "まだ死ななかった。休憩中だけである。"
-
-#: src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "あなたはもう存在していない。"
-
-#: src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "生きることなく、いなくなった。"
-
-#: src/net/tmwa/playerhandler.cpp:130
-msgid "You've expired and gone to meet your maker."
-msgstr "あなたは息を引き取り、あなたを作った人へ逢いに行ってしまった。"
-
-#: src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "あなたは死体である。"
-
-#: src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "命を失い、天国に向かった。"
-
-#: src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃないか？"
-
-#: src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "あなたのがんばりは今や歴史となったらしい。"
-
-#: src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr "クタバッタみたいな。"
-
-#: src/net/tmwa/playerhandler.cpp:136
-msgid "You've kicked the bucket."
-msgstr "人間界から追い出された。"
-
-#: src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr "最後の呼吸だった。死神に会った後、無と結合しちゃった。"
-
-#: src/net/tmwa/playerhandler.cpp:139
-msgid "You are an ex-player."
-msgstr "旧プレイヤーである。"
-
-#: src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr "お前の魂は北極まで飛ばれた。"
-
-#: src/net/tmwa/playerhandler.cpp:342 src/net/tmwa/playerhandler.cpp:352
-#: src/net/tmwa/playerhandler.cpp:431
-msgid "Message"
-msgstr "メッセージ"
-
-#: src/net/tmwa/playerhandler.cpp:343
-msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "持っているアイテムは体重より半分以上なので、体力が回復できない。"
-
-#: src/net/tmwa/playerhandler.cpp:353
-msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
-
-#: src/net/tmwa/playerhandler.cpp:458
-#, c-format
-msgid "You picked up %s."
-msgstr ""
-
-#: src/net/tmwa/playerhandler.cpp:464
-#, c-format
-msgid "You spent %s."
-msgstr "あなたは %s を費やし"
-
-#: src/net/tmwa/playerhandler.cpp:509
-msgid "Cannot raise skill!"
-msgstr "スキルはもう上がらない！"
-
-#: src/net/tmwa/playerhandler.cpp:629
-msgid "Equip arrows first."
-msgstr "矢を先に装備してください。"
-
-#: src/net/tmwa/specialhandler.cpp:158
-msgid "Trade failed!"
-msgstr "取引失敗"
-
-#: src/net/tmwa/specialhandler.cpp:161
-msgid "Emote failed!"
-msgstr "スマイリー表示失敗"
-
-#: src/net/tmwa/specialhandler.cpp:164
-msgid "Sit failed!"
-msgstr "触ることが失敗した。"
-
-#: src/net/tmwa/specialhandler.cpp:167
-msgid "Chat creating failed!"
-msgstr "チャット作成失敗"
-
-#: src/net/tmwa/specialhandler.cpp:170
-msgid "Could not join party!"
-msgstr "パーティに参加できなかった！"
-
-#: src/net/tmwa/specialhandler.cpp:173
-msgid "Cannot shout!"
-msgstr "叫べない！"
-
-#: src/net/tmwa/specialhandler.cpp:186
-msgid "You have not yet reached a high enough lvl!"
-msgstr "あなたはまだ十分に高いlvlを達していない！"
-
-#: src/net/tmwa/specialhandler.cpp:190
-msgid "Insufficient HP!"
-msgstr "HP不足！"
-
-#: src/net/tmwa/specialhandler.cpp:193
-msgid "Insufficient SP!"
-msgstr "SP不足！"
-
-#: src/net/tmwa/specialhandler.cpp:196
-msgid "You have no memos!"
-msgstr "メモなし！"
-
-#: src/net/tmwa/specialhandler.cpp:199
-msgid "You cannot do that right now!"
-msgstr "今この行動は無理。"
-
-#: src/net/tmwa/specialhandler.cpp:202
-msgid "Seems you need more money... ;-)"
-msgstr "金欠みたいんじゃないか…"
-
-#: src/net/tmwa/specialhandler.cpp:205
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "本スキルがこの武器と使えない。"
-
-#: src/net/tmwa/specialhandler.cpp:209
-msgid "You need another red gem!"
-msgstr "他の赤宝石が必要となった！"
-
-#: src/net/tmwa/specialhandler.cpp:212
-msgid "You need another blue gem!"
-msgstr "他の青宝石が必要となった！"
-
-#: src/net/tmwa/specialhandler.cpp:215
-msgid "You're carrying to much to do this!"
-msgstr "アイテムが持ちすぎている状態！"
-
-#: src/net/tmwa/specialhandler.cpp:218
-msgid "Huh? What's that?"
-msgstr "うん？何それ？"
-
-#: src/net/tmwa/specialhandler.cpp:229
-msgid "Warp failed..."
-msgstr "ワープが失敗した。"
-
-#: src/net/tmwa/specialhandler.cpp:232
-msgid "Could not steal anything..."
-msgstr "何も盗めなかった…"
-
-#: src/net/tmwa/specialhandler.cpp:235
-msgid "Poison had no effect..."
-msgstr "毒は不効果"
-
-#: src/net/tmwa/tradehandler.cpp:148
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "取引は不可能。取引の相手は遠すぎる。"
-
-#: src/net/tmwa/tradehandler.cpp:152
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "取引は不可能。本キャラが存在していない。"
-
-#: src/net/tmwa/tradehandler.cpp:156
-msgid "Trade cancelled due to an unknown reason."
-msgstr "不明な理由で取引が中止された。"
-
-#: src/net/tmwa/tradehandler.cpp:164
-#, c-format
-msgid "Trade: You and %s"
-msgstr "あなたと%sとの取引"
-
-#: src/net/tmwa/tradehandler.cpp:174
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "%sとの取引が中止された。"
-
-#: src/net/tmwa/tradehandler.cpp:187
-msgid "Unhandled trade cancel packet."
-msgstr "できなかった取引キャンセルパケット"
-
-#: src/net/tmwa/tradehandler.cpp:250
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "アイテム追加失敗。相手はアイテムを持ちすぎている状態である。"
-
-#: src/net/tmwa/tradehandler.cpp:255
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "アイテム追加失敗。相手の空いているスロットはない。"
-
-#: src/net/tmwa/tradehandler.cpp:260
-msgid "Failed adding item. You can't trade this item."
-msgstr ""
-
-#: src/net/tmwa/tradehandler.cpp:264
-msgid "Failed adding item for unknown reason."
-msgstr "不明な理由でアイテム追加失敗"
-
 #: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr "'...'を表示する"
@@ -5304,32 +4724,32 @@ msgstr "フローティング'...'バブル"
 msgid "Floating bubble"
 msgstr "フローティングバブル"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "名前なし"
 
-#: src/resources/itemdb.cpp:62
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "Attack %+d"
 msgstr "攻撃 %+d"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:66
 #, c-format
 msgid "Defense %+d"
 msgstr "防御 %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:67
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:68
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:168
+#: src/resources/itemdb.cpp:171
 msgid "Unknown item"
 msgstr "不明なアイテム"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 59a4795bc..71f69d332 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,35 +40,35 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -77,50 +77,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1628
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -294,43 +294,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -452,7 +452,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -975,7 +975,7 @@ msgstr ""
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr ""
 
@@ -1859,11 +1859,11 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr ""
 
@@ -2072,6 +2072,10 @@ msgstr ""
 msgid "Hide shield sprite"
 msgstr ""
 
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr ""
@@ -2212,8 +2216,8 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2265,130 +2269,134 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 msgid "Enable opacity cache"
 msgstr ""
 
-#: src/gui/setup_video.cpp:305
+#: src/gui/setup_video.cpp:306
 msgid "Enable map reduce"
 msgstr ""
 
-#: src/gui/setup_video.cpp:307
-msgid "Show background"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 12da8475c..66bae7216 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
@@ -41,35 +41,35 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -78,50 +78,50 @@ msgstr "Wijzigen spelservers"
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/client.cpp:1628
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -298,43 +298,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -456,7 +456,7 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -979,7 +979,7 @@ msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "Opslaan"
 
@@ -1869,11 +1869,11 @@ msgstr "Blauw:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
@@ -2084,6 +2084,10 @@ msgstr ""
 msgid "Hide shield sprite"
 msgstr ""
 
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr ""
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relatie"
@@ -2225,8 +2229,8 @@ msgstr "Lettergrootte"
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -2278,133 +2282,137 @@ msgstr "gemiddeld"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Hw acceleration"
 msgstr "Hw acceleratie"
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "Deeltjes effecten"
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "Notificatie bij oprapen weergeven"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "in chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "als deeltje"
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 msgid "Enable opacity cache"
 msgstr ""
 
-#: src/gui/setup_video.cpp:305
+#: src/gui/setup_video.cpp:306
 #, fuzzy
 msgid "Enable map reduce"
 msgstr "Zet muziek aan"
 
-#: src/gui/setup_video.cpp:307
-msgid "Show background"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
 msgstr "Geen"
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:                "
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
 "resolutie"
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "Wijzigingen treden in werking bij het wisselen van map."
 
diff --git a/po/pt.po b/po/pt.po
index ebd34e932..cc6685284 100644
--- a/po/pt.po
+++ b/po/pt.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.
-#
+# 
 #   <freya.df@gmail.com>, 2011.
 # freya <freya.df@gmail.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
@@ -9,15 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
-"PO-Revision-Date: 2011-07-23 15:40+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
-"pt/)\n"
-"Language: pt\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"PO-Revision-Date: 2011-08-08 01:29+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1034
@@ -42,35 +41,35 @@ msgstr "A"
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -79,50 +78,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1628
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -138,11 +137,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:409
 #, 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 ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
-"já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
+" já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:429
 #, c-format
@@ -296,46 +295,45 @@ msgstr "Recursos de imagens orfãos:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -457,7 +455,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -980,7 +978,7 @@ msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "Armazenar"
 
@@ -1865,11 +1863,11 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
@@ -2078,6 +2076,10 @@ msgstr "Modo de baixo tráfego"
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr "Mostrar imagem de fundo"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relação"
@@ -2218,8 +2220,8 @@ msgstr "Tamanho da fonte"
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2271,134 +2273,138 @@ msgstr "médio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Hw acceleration"
 msgstr "Aceleração por HW"
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "Mostrar aviso ao pegar algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "em chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 msgid "Enable opacity cache"
 msgstr "Habilitar cache de opacidade"
 
-#: src/gui/setup_video.cpp:305
+#: src/gui/setup_video.cpp:306
 msgid "Enable map reduce"
 msgstr "Habilitar redução de mapa"
 
-#: src/gui/setup_video.cpp:307
-msgid "Show background"
-msgstr "Mostrar imagem de fundo"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "Opacidade"
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -3196,7 +3202,8 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/tradewindow.cpp:332
-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 ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3539,7 +3546,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: 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 o outro jogador se ele estiver sendo ignorado."
 
@@ -4773,497 +4781,4 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
-#~ msgid ""
-#~ "Access denied. Most likely, there are too many players on this server."
-#~ msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
-
-#~ msgid "Cannot use this ID."
-#~ msgstr "Não é possível usar este ID."
-
-#~ msgid "Unknown char-server failure."
-#~ msgstr "Erro desconhecido do char-server."
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
-
-#~ msgid "Wrong name."
-#~ msgstr "Nome errado."
-
-#~ msgid "Incorrect stats."
-#~ msgstr "Stats incorretos."
-
-#~ msgid "Incorrect hair."
-#~ msgstr "Cabelo incorreto."
-
-#~ msgid "Incorrect slot."
-#~ msgstr "Slot incorreto."
-
-#~ msgid "Character deleted."
-#~ msgstr "Personagem deletado."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Falha ao deletar personagem."
-
-#~ msgid "Strength:"
-#~ msgstr "Força:"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilidade:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalidade:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligência:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Destreza:"
-
-#~ msgid "Luck:"
-#~ msgstr "Sorte:"
-
-#~ msgid "Whisper could not be sent, %s is offline."
-#~ msgstr "Mensagem privada não pode ser enviada, %s está offline."
-
-#~ msgid "Whisper could not be sent, ignored by %s."
-#~ msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
-
-#~ msgid "MVP player."
-#~ msgstr "Jogador VIP."
-
-#~ msgid "MVP player: "
-#~ msgstr "Jogador VIP:  "
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Não há suporte para canais!"
-
-#~ msgid "Online users: %d"
-#~ msgstr "Jogadores online: %d"
-
-#~ msgid "Game"
-#~ msgstr "Jogo"
-
-#~ msgid "Request to quit denied!"
-#~ msgstr "Requisição de saída negada!"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Exibe esta ajuda."
-
-#~ msgid "/invite > Invite a player to your guild"
-#~ msgstr "/invite > Convida um jogador para a sua guilda"
-
-#~ msgid "/leave > Leave the guild you are in"
-#~ msgstr "/leave > Sai da guilda em que você está"
-
-#~ msgid "/kick > Kick some one from the guild you are in"
-#~ msgstr "/kick > Expulsa alguém da guilda em que você está"
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Comando: /invite <nick>"
-
-#~ msgid "This command invites <nick> to the guild you're in."
-#~ msgstr "Este comando convida <nick> para a guilda em que você está."
-
-#~ msgid "Command: /leave"
-#~ msgstr "Comando: /leave"
-
-#~ msgid "This command causes the player to leave the guild."
-#~ msgstr "Este comando faz com que o jogador saia da guilda."
-
-#~ msgid "You are already in guild."
-#~ msgstr "Você já está em uma guilda"
-
-#~ msgid "Emperium check failed."
-#~ msgstr "Falha ao checar Emperium"
-
-#~ msgid "Unknown server response."
-#~ msgstr "Resposta do servidor desconhecida."
-
-#~ msgid "Guild name: %s"
-#~ msgstr "Nome Guilda: %s"
-
-#~ msgid "Guild master: %s"
-#~ msgstr "Mestre da guilda: %s"
-
-#~ msgid "Guild level: %d"
-#~ msgstr "Nível Guilda: %d"
-
-#~ msgid "Online members: %d"
-#~ msgstr "Membros Online: %d"
-
-#~ msgid "Max members: %d"
-#~ msgstr "Max Membros: %d"
-
-#~ msgid "Average level: %d"
-#~ msgstr "Nível médio: %d"
-
-#~ msgid "Guild exp: %d"
-#~ msgstr "Guilda exp: %d"
-
-#~ msgid "Guild next exp: %d"
-#~ msgstr "Guilda prox. exp: %d"
-
-#~ msgid "Guild castle: %s"
-#~ msgstr "Castelo Guilda : %s"
-
-#~ msgid "Could not inivte user to guild."
-#~ msgstr "Não foi possível convidar jogador para a guilda."
-
-#~ msgid "User rejected guild invite."
-#~ msgstr "O jogador rejeitou o convite."
-
-#~ msgid "User is now part of your guild."
-#~ msgstr "Usuário agora é um membro da sua guilda."
-
-#~ msgid "Your guild is full."
-#~ msgstr "Sua guilda está cheia."
-
-#~ msgid "Unknown guild invite response."
-#~ msgstr "Resposta desconhecida de convite para guilda."
-
-#~ msgid "You have left the guild."
-#~ msgstr "Você saiu da Guilda."
-
-#~ msgid "%s has left your guild."
-#~ msgstr "%s saiu de sua Guilda."
-
-#~ msgid "You was kicked from guild."
-#~ msgstr "Você foi expulso da Guilda."
-
-#~ msgid "%s has kicked from your guild."
-#~ msgstr "%s foi expulso da Guilda."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Convida um jogador para o seu grupo"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Sai do grupo em que você está"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Expulsa alguém do grupo em que você está"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr "/item > Mostra/Muda opções de compartilhamento de itens do grupo"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr ""
-#~ "/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Este comando convida <nick> para o seu grupo."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Este comando faz com que o jogador saia do grupo."
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Comando> /item <opção>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr "Este comando muda a opção de compartilhamento de itens do grupo."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, "
-#~ "or \"0\", \"no\", \"false\" to disable item sharing."
-#~ msgstr ""
-#~ "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar "
-#~ "compartilhamento de itens, ou \"0\", \"no\" e \"false\" para desabilitar."
-
-#~ msgid "Command: /item"
-#~ msgstr "Comando: /item"
-
-#~ msgid "This command displays the party's current item sharing policy."
-#~ msgstr ""
-#~ "Este comando exibe a atual opção de compartilhamento de itens do grupo."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Comando: /exp <policy>"
-
-#~ msgid "This command changes the party's experience sharing policy."
-#~ msgstr ""
-#~ "Este comando muda a opção de compartilhamento de experiência do grupo."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-#~ "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-#~ msgstr ""
-#~ "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar "
-#~ "compartilhamento de experiência, ou \"0\", \"no\" e \"false\" para "
-#~ "desabilitar."
-
-#~ msgid "Command: /exp"
-#~ msgstr "Comando: /exp"
-
-#~ msgid "This command displays the party's current experience sharing policy."
-#~ msgstr ""
-#~ "Este comando exibe a atual opção de compartilhamento de experiência do "
-#~ "grupo."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Compartilhamento de itens habilitado."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Compartilhamento de itens desabilitado."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "Não é possível compartilhar itens."
-
-#~ msgid "Item sharing unknown."
-#~ msgstr "Compartilhamento de itens desconhecido."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Compartilhamento de experiência habilitado."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Compartilhamento de experiência desabilitado."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "Não é possível compartilhar experiência."
-
-#~ msgid "Experience sharing unknown."
-#~ msgstr "Compartilhamento de experiência desconhecido."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Falha ao usar item."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Impossível equipar."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Conta não encontrada. Por favor, tente novamente."
-
-#~ msgid "New password too short."
-#~ msgstr "Nova senha é muito curta."
-
-#~ msgid "Unregistered ID."
-#~ msgstr "ID não registrado."
-
-#~ msgid "Wrong password."
-#~ msgstr "Senha incorreta."
-
-#~ msgid "Account expired."
-#~ msgstr "A conta expirou."
-
-#~ msgid "Rejected from server."
-#~ msgstr "Rejeitado pelo servidor."
-
-#~ msgid ""
-#~ "You have been permanently banned from the game. Please contact the GM "
-#~ "team."
-#~ msgstr ""
-#~ "Você foi permanentemente banido do jogo. Por favor entre em contato com "
-#~ "algum GM."
-
-#~ msgid "Client too old."
-#~ msgstr "Cliente muito antigo."
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ msgstr ""
-#~ "Você banido do jogo até %s.\n"
-#~ "Por favor entre em contato com algum GM através do fórum."
-
-#~ msgid "Server overpopulated."
-#~ msgstr "Server lotado."
-
-#~ msgid "This user name is already taken."
-#~ msgstr "Este nome de usuário já está em uso."
-
-#~ msgid "Username permanently erased."
-#~ msgstr "Usuário deletado."
-
-#~ msgid "Could not create party."
-#~ msgstr "Não foi possível criar o grupo."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Grupo criado."
-
-#~ msgid "%s has joined your party."
-#~ msgstr "%s se junto ao grupo"
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s já é membro de um grupo."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s recusou seu convite."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s agora é um membro do seu grupo."
-
-#~ msgid "%s can't join your party because party is full."
-#~ msgstr "%s não pode se juntar ao gupo cheio."
-
-#~ msgid "QQQ Unknown invite response for %s."
-#~ msgstr "QQQ resposta de convite desconhecida por %s."
-
-#~ msgid "You have left the party."
-#~ msgstr "Você saiu do grupo."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s saiu do seu grupo."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Um membro desconhecido tentou dizer: %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Insira uma moeda para continuar."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Você não morreu ainda. Está apenas descansando."
-
-#~ msgid "You are no more."
-#~ msgstr "Você não é mais."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Você deixou de ser."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Você expirou e foi encontrar seu criador."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Você é um cadáver."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Sem vida, você descansa em paz."
-
-#~ msgid "If you weren't so animated, you'd be pushing up the daisies."
-#~ msgstr "Se não fosse tão animado, estaria comendo grama pela raiz."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Seus processos metabólicos agora são história."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Você bateu as botas."
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Você chutou o balde."
-
-#~ msgid ""
-#~ "You've shuffled off your mortal coil, run down the curtain and joined the "
-#~ "bleedin' choir invisibile."
-#~ msgstr ""
-#~ "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao "
-#~ "maldito coro invisível."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Você é um ex-jogador"
-
-#~ msgid "You're pining for the fjords."
-#~ msgstr "Você foi desta para melhor."
-
-#~ msgid "Message"
-#~ msgstr "Mensagem"
-
-#~ msgid ""
-#~ "You are carrying more than half your weight. You are unable to regain "
-#~ "health."
-#~ msgstr ""
-#~ "Você está carregando mais que a metade de seu peso. Você não poderá mais "
-#~ "recuperar HP."
-
-#~ msgid "You are carrying less than half your weight. You can regain health."
-#~ msgstr ""
-#~ "Você está carregando menos da metade de seu peso. Você vai recuperar-se "
-#~ "novamente."
-
-#~ msgid "You picked up %s."
-#~ msgstr "Você pegou %s."
-
-#~ msgid "You spent %s."
-#~ msgstr "Você gastou %s"
-
-#~ msgid "Cannot raise skill!"
-#~ msgstr "Impossível aumentar o atributo!"
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Equipe as flechas primeiro."
-
-#~ msgid "Trade failed!"
-#~ msgstr "Falha na negociação!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Falha no emoticon!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Falha ao sentar!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Falha ao criar Chat!"
-
-#~ msgid "Could not join party!"
-#~ msgstr "Impossivel entrar no grupo!"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Impossivel gritar!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Você ainda não tem o nivel necessário!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "HP insuficiente!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "SP insuficiente!"
-
-#~ msgid "You have no memos!"
-#~ msgstr "Você não tem nenhuma nota armazenada!"
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Você não pode fazer isso agora!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Parece que você precisa de mais dinheiro... ;-)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Você precisa de outra gema vermelha!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Você precisa de outra jóia azul!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Você está com muita carga para fazer isso!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Hã? O que é isso?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Falha ao transportar..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Não foi possível roubar nada..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Veneno não surtiu efeito..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Negociação impossível. O parceiro de negócios está muito longe."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Negociação impossível. O personagem não existe."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Negociação cancelada devido a uma razão desconhecida."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Negociação: Você e %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Negociação com %s cancelada."
-
-#~ msgid "Unhandled trade cancel packet."
-#~ msgstr "Troca injusta pacote cancelado."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
-
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr "Falha ao adicionar item. Você não pode trocar este item."
 
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Erro ao adicionar item devido a um motivo desconhecido."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5e3a84258..20477c255 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.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.
-#
+# 
 #   <alasmirt@gmail.com>, 2011.
 # alastrim <alasmirt@gmail.com>, 2011.
 #   <freya.df@gmail.com>, 2011.
@@ -11,15 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
-"PO-Revision-Date: 2011-07-23 15:40+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
-"manaplus/team/pt_BR/)\n"
-"Language: pt_BR\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"PO-Revision-Date: 2011-08-08 01:29+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/manaplus/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1034
@@ -44,35 +43,35 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -81,50 +80,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1628
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -140,11 +139,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:409
 #, 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 ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
-"já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
+" já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:429
 #, c-format
@@ -298,46 +297,45 @@ msgstr "Recurso de imagem orfão:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -459,7 +457,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -982,7 +980,7 @@ msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "Armazenar"
 
@@ -1867,11 +1865,11 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
@@ -2080,6 +2078,10 @@ msgstr "Modo de baixo tráfego"
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr "Mostrar imagem de fundo"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Relação"
@@ -2220,8 +2222,8 @@ msgstr "Tamanho da fonte"
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2273,134 +2275,138 @@ msgstr "médio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Hw acceleration"
 msgstr "Aceleração por HW"
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "Mostrar aviso ao pegar algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "em chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 msgid "Enable opacity cache"
 msgstr "Habilitar cache de opacidade"
 
-#: src/gui/setup_video.cpp:305
+#: src/gui/setup_video.cpp:306
 msgid "Enable map reduce"
 msgstr "Habilitar a redução de mapa"
 
-#: src/gui/setup_video.cpp:307
-msgid "Show background"
-msgstr "Mostrar imagem de fundo"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
+msgstr ""
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "Opacidade"
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
@@ -3198,7 +3204,8 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/tradewindow.cpp:332
-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 ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3541,7 +3548,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: 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 o outro jogador se ele estiver sendo ignorado."
 
@@ -4775,497 +4783,4 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
-#~ msgid ""
-#~ "Access denied. Most likely, there are too many players on this server."
-#~ msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
-
-#~ msgid "Cannot use this ID."
-#~ msgstr "Não é possível usar este ID."
-
-#~ msgid "Unknown char-server failure."
-#~ msgstr "Erro desconhecido do char-server."
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
-
-#~ msgid "Wrong name."
-#~ msgstr "Nome errado."
-
-#~ msgid "Incorrect stats."
-#~ msgstr "Stats incorretos."
-
-#~ msgid "Incorrect hair."
-#~ msgstr "Cabelo incorreto."
-
-#~ msgid "Incorrect slot."
-#~ msgstr "Slot incorreto."
-
-#~ msgid "Character deleted."
-#~ msgstr "Personagem deletado."
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Falha ao deletar personagem."
-
-#~ msgid "Strength:"
-#~ msgstr "Força:"
-
-#~ msgid "Agility:"
-#~ msgstr "Agilidade:"
-
-#~ msgid "Vitality:"
-#~ msgstr "Vitalidade:"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Inteligência:"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Destreza:"
-
-#~ msgid "Luck:"
-#~ msgstr "Sorte:"
-
-#~ msgid "Whisper could not be sent, %s is offline."
-#~ msgstr "Mensagem privada não pode ser enviada, %s está offline."
-
-#~ msgid "Whisper could not be sent, ignored by %s."
-#~ msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
-
-#~ msgid "MVP player."
-#~ msgstr "Jogador VIP."
-
-#~ msgid "MVP player: "
-#~ msgstr "Jogador VIP:  "
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Não há suporte para canais!"
-
-#~ msgid "Online users: %d"
-#~ msgstr "Jogadores online: %d"
-
-#~ msgid "Game"
-#~ msgstr "Jogo"
-
-#~ msgid "Request to quit denied!"
-#~ msgstr "Requisição de saída negada!"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Exibe esta ajuda."
-
-#~ msgid "/invite > Invite a player to your guild"
-#~ msgstr "/invite > Convida um jogador para a sua guilda"
-
-#~ msgid "/leave > Leave the guild you are in"
-#~ msgstr "/leave > Sai da guilda em que você está"
-
-#~ msgid "/kick > Kick some one from the guild you are in"
-#~ msgstr "/kick > Expulsa alguém da guilda em que você está"
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Comando: /invite <nick>"
-
-#~ msgid "This command invites <nick> to the guild you're in."
-#~ msgstr "Este comando convida <nick> para a guilda em que você está."
-
-#~ msgid "Command: /leave"
-#~ msgstr "Comando: /leave"
-
-#~ msgid "This command causes the player to leave the guild."
-#~ msgstr "Este comando faz com que o jogador saia da guilda."
-
-#~ msgid "You are already in guild."
-#~ msgstr "Você já está em uma Guilda"
-
-#~ msgid "Emperium check failed."
-#~ msgstr "Falha ao checar Emperium"
-
-#~ msgid "Unknown server response."
-#~ msgstr "Resposta do servidor desconhecida."
-
-#~ msgid "Guild name: %s"
-#~ msgstr "Nome Guilda: %s"
-
-#~ msgid "Guild master: %s"
-#~ msgstr "Mestre da guilda: %s"
-
-#~ msgid "Guild level: %d"
-#~ msgstr "Nível Guilda: %d"
-
-#~ msgid "Online members: %d"
-#~ msgstr "Membros Online: %d"
-
-#~ msgid "Max members: %d"
-#~ msgstr "Max Membros: %d"
-
-#~ msgid "Average level: %d"
-#~ msgstr "Nível médio: %d"
-
-#~ msgid "Guild exp: %d"
-#~ msgstr "Guilda exp: %d"
-
-#~ msgid "Guild next exp: %d"
-#~ msgstr "Guilda prox. exp: %d"
-
-#~ msgid "Guild castle: %s"
-#~ msgstr "Castelo Guilda : %s"
-
-#~ msgid "Could not inivte user to guild."
-#~ msgstr "Não foi possível convidar jogador para a guilda."
-
-#~ msgid "User rejected guild invite."
-#~ msgstr "O jogador rejeitou o convite."
-
-#~ msgid "User is now part of your guild."
-#~ msgstr "Usuário agora é um membro da sua guilda."
-
-#~ msgid "Your guild is full."
-#~ msgstr "Sua guilda está cheia."
-
-#~ msgid "Unknown guild invite response."
-#~ msgstr "Resposta desconhecida de convite para guilda."
-
-#~ msgid "You have left the guild."
-#~ msgstr "Você saiu da Guilda."
-
-#~ msgid "%s has left your guild."
-#~ msgstr "%s saiu de sua Guilda."
-
-#~ msgid "You was kicked from guild."
-#~ msgstr "Você foi expulso da Guilda."
-
-#~ msgid "%s has kicked from your guild."
-#~ msgstr "%s foi expulso da Guilda."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Convida um jogador para o seu grupo"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Sai do grupo em que você está"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Expulsa alguém do grupo em que você está"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr "/item > Mostra/Muda opções de compartilhamento de itens do grupo"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr ""
-#~ "/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Este comando convida <nick> para o seu grupo."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Este comando faz com que o jogador saia do grupo."
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Comando> /item <opção>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr "Este comando muda a opção de compartilhamento de itens do grupo."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, "
-#~ "or \"0\", \"no\", \"false\" to disable item sharing."
-#~ msgstr ""
-#~ "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar "
-#~ "compartilhamento de itens, ou \"0\", \"no\" e \"false\" para desabilitar."
-
-#~ msgid "Command: /item"
-#~ msgstr "Comando: /item"
-
-#~ msgid "This command displays the party's current item sharing policy."
-#~ msgstr ""
-#~ "Este comando exibe a atual opção de compartilhamento de itens do grupo."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Comando: /exp <policy>"
-
-#~ msgid "This command changes the party's experience sharing policy."
-#~ msgstr ""
-#~ "Este comando muda a opção de compartilhamento de experiência do grupo."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-#~ "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-#~ msgstr ""
-#~ "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar "
-#~ "compartilhamento de experiência, ou \"0\", \"no\" e \"false\" para "
-#~ "desabilitar."
-
-#~ msgid "Command: /exp"
-#~ msgstr "Comando: /exp"
-
-#~ msgid "This command displays the party's current experience sharing policy."
-#~ msgstr ""
-#~ "Este comando exibe a atual opção de compartilhamento de experiência do "
-#~ "grupo."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Compartilhamento de itens habilitado."
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Compartilhamento de itens desabilitado."
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "Não é possível compartilhar itens."
-
-#~ msgid "Item sharing unknown."
-#~ msgstr "Compartilhamento de itens desconhecido."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Compartilhamento de experiência habilitado."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Compartilhamento de experiência desabilitado."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "Não é possível compartilhar experiência."
-
-#~ msgid "Experience sharing unknown."
-#~ msgstr "Compartilhamento de experiência desconhecido."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Falha ao usar item."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Impossível equipar."
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Conta não encontrada. Por favor, tente novamente."
-
-#~ msgid "New password too short."
-#~ msgstr "Nova senha é muito curta."
-
-#~ msgid "Unregistered ID."
-#~ msgstr "ID não registrado."
-
-#~ msgid "Wrong password."
-#~ msgstr "Senha incorreta."
-
-#~ msgid "Account expired."
-#~ msgstr "A conta expirou."
-
-#~ msgid "Rejected from server."
-#~ msgstr "Rejeitado pelo servidor."
-
-#~ msgid ""
-#~ "You have been permanently banned from the game. Please contact the GM "
-#~ "team."
-#~ msgstr ""
-#~ "Você foi permanentemente banido do jogo. Por favor entre em contato com "
-#~ "algum GM."
-
-#~ msgid "Client too old."
-#~ msgstr "Cliente muito antigo."
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ msgstr ""
-#~ "Você banido do jogo até %s.\n"
-#~ "Por favor entre em contato com algum GM através do fórum."
-
-#~ msgid "Server overpopulated."
-#~ msgstr "Servidor lotado."
-
-#~ msgid "This user name is already taken."
-#~ msgstr "Este nome de usuário já está em uso."
-
-#~ msgid "Username permanently erased."
-#~ msgstr "Usuário apagado permanentemente. "
-
-#~ msgid "Could not create party."
-#~ msgstr "Não foi possível criar o grupo."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Grupo criado."
-
-#~ msgid "%s has joined your party."
-#~ msgstr "%s se juntou ao grupo"
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s já é membro de um grupo."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s recusou seu convite."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s agora é um membro do seu grupo."
-
-#~ msgid "%s can't join your party because party is full."
-#~ msgstr "%s não pode se juntar ao grupo cheio."
-
-#~ msgid "QQQ Unknown invite response for %s."
-#~ msgstr "QQQ resposta de convite desconhecida por %s."
-
-#~ msgid "You have left the party."
-#~ msgstr "Você saiu do grupo."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s saiu do seu grupo."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Um membro desconhecido tentou dizer: %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Insira uma moeda para continuar."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Você não morreu ainda. Está apenas descansando."
-
-#~ msgid "You are no more."
-#~ msgstr "Você não é mais."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Você deixou de ser."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Você expirou e foi encontrar seu criador."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Você é um cadáver."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Sem vida, você descansa em paz."
-
-#~ msgid "If you weren't so animated, you'd be pushing up the daisies."
-#~ msgstr "Se não fosse tão animado, estaria comendo grama pela raiz."
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Seus processos metabólicos agora são história."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Você bateu as botas."
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Você chutou o balde."
-
-#~ msgid ""
-#~ "You've shuffled off your mortal coil, run down the curtain and joined the "
-#~ "bleedin' choir invisibile."
-#~ msgstr ""
-#~ "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao "
-#~ "maldito coro invisível."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Você é um ex-jogador"
-
-#~ msgid "You're pining for the fjords."
-#~ msgstr "Você foi desta para melhor."
-
-#~ msgid "Message"
-#~ msgstr "Mensagem"
-
-#~ msgid ""
-#~ "You are carrying more than half your weight. You are unable to regain "
-#~ "health."
-#~ msgstr ""
-#~ "Você está carregando mais que a metade de seu peso. Você não poderá mais "
-#~ "recuperar HP."
-
-#~ msgid "You are carrying less than half your weight. You can regain health."
-#~ msgstr ""
-#~ "Você está carregando menos ou metade de seu peso. Você pode recuperar-se "
-#~ "novamente."
-
-#~ msgid "You picked up %s."
-#~ msgstr "Você pegou %s."
-
-#~ msgid "You spent %s."
-#~ msgstr "Você gastou %s"
-
-#~ msgid "Cannot raise skill!"
-#~ msgstr "Impossível aumentar o atributo!"
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Equipe as flechas primeiro."
-
-#~ msgid "Trade failed!"
-#~ msgstr "Falha na negociação!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Falha no emoticon!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Falha ao sentar!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Falha ao criar Chat!"
-
-#~ msgid "Could not join party!"
-#~ msgstr "Impossivel entrar no grupo!"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Impossivel gritar!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "Você ainda não tem o nivel necessário!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "HP insuficiente!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "SP insuficiente!"
-
-#~ msgid "You have no memos!"
-#~ msgstr "Você não tem nenhuma nota armazenada!"
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Você não pode fazer isso agora!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Parece que você precisa de mais dinheiro... ;-)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Você precisa de outra gema vermelha!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Você precisa de outra jóia azul!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Você está com muita carga para fazer isso!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "Hã? O que é isso?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Falha ao transportar..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Não foi possível roubar nada..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Veneno não surtiu efeito..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Negociação impossível. O parceiro de negócios está muito longe."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Negociação impossível. O personagem não existe."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Negociação cancelada devido a uma razão desconhecida."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Negociação: Você e %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Negociação com %s cancelada."
-
-#~ msgid "Unhandled trade cancel packet."
-#~ msgstr "Troca injusta pacote cancelado."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
-
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr "Falha ao adicionar item. Você não pode trocar este item."
 
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Erro ao adicionar item devido a um motivo desconhecido."
diff --git a/po/ru.po b/po/ru.po
index 25b85608c..4a013b7c5 100644
--- a/po/ru.po
+++ b/po/ru.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.
-#
+# 
 #   <reslayer@mail.ru>, 2011.
 #   <Necromong@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
@@ -10,17 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-06 16:24+0300\n"
-"PO-Revision-Date: 2011-07-21 23:52+0000\n"
+"POT-Creation-Date: 2011-08-08 04:26+0300\n"
+"PO-Revision-Date: 2011-08-08 01:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
-"ru/)\n"
-"Language: ru\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: src/actorspritemanager.cpp:1034
 msgid "Visible on map"
@@ -44,35 +42,35 @@ msgstr "О"
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:825 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:825 src/gui/setup.cpp:51 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:907
+#: src/client.cpp:908
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:938
+#: src/client.cpp:939
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:971
+#: src/client.cpp:972
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1071
+#: src/client.cpp:1072
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1112
+#: src/client.cpp:1113
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1149 src/client.cpp:1156 src/client.cpp:1293
+#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
@@ -81,50 +79,50 @@ msgstr "Смена игрового сервера"
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1165
+#: src/client.cpp:1166
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1192
+#: src/client.cpp:1193
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1194
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1212
+#: src/client.cpp:1213
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1213
+#: src/client.cpp:1214
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1233
+#: src/client.cpp:1234
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1234
+#: src/client.cpp:1235
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1918
+#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
+#: src/client.cpp:1919
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1628
+#: src/client.cpp:1629
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1663 src/client.cpp:1669
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1689
+#: src/client.cpp:1690
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -140,11 +138,11 @@ msgstr "Нельзя отправлять пустые сообщения!"
 #: src/commandhandler.cpp:409
 #, 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 ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
-"уже создана, или этот игрок Вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
+" уже создана, или этот игрок Вы сами."
 
 #: src/commandhandler.cpp:429
 #, c-format
@@ -303,47 +301,45 @@ msgstr "Удаленных изображений:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
-"\"0\"."
+msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
 
-#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:464
+#: src/game.cpp:475
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:472
+#: src/game.cpp:483
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:511
+#: src/game.cpp:523
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:525
+#: src/game.cpp:537
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1184
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1066
+#: src/game.cpp:1191
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1449
+#: src/game.cpp:1576
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1450
+#: src/game.cpp:1577
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -465,7 +461,7 @@ msgstr "Продать"
 #: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
 #: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:68
 #: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updatewindow.cpp:157
@@ -988,7 +984,7 @@ msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
 #: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:68
+#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:69
 msgid "Store"
 msgstr "Сохранить"
 
@@ -1875,11 +1871,11 @@ msgstr "Синий:"
 msgid "Alpha:"
 msgstr "Прозрачность:"
 
-#: src/gui/setup.cpp:66
+#: src/gui/setup.cpp:67
 msgid "Apply"
 msgstr "Применить"
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:70
 msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
@@ -2088,6 +2084,10 @@ msgstr "Режим кеширования игроков"
 msgid "Hide shield sprite"
 msgstr "Спрятать картинку счита"
 
+#: src/gui/setup_other.cpp:169
+msgid "Show background"
+msgstr "Показать фон"
+
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
 msgstr "Отношение"
@@ -2228,8 +2228,8 @@ msgstr "Размер шрифта"
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
-#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:658
-#: src/gui/setup_video.cpp:663
+#: src/gui/setup_theme.cpp:282 src/gui/setup_video.cpp:670
+#: src/gui/setup_video.cpp:675
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу."
 
@@ -2281,136 +2281,140 @@ msgstr "средне"
 msgid "max"
 msgstr "макс."
 
-#: src/gui/setup_video.cpp:292
+#: src/gui/setup_video.cpp:293
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Hw acceleration"
 msgstr "Аппаратное ускорение"
 
-#: src/gui/setup_video.cpp:294
+#: src/gui/setup_video.cpp:295
 msgid "Custom cursor"
 msgstr "Игровой курсор"
 
-#: src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:297
 msgid "Particle effects"
 msgstr "Эффекты частиц"
 
-#: src/gui/setup_video.cpp:298
+#: src/gui/setup_video.cpp:299
 msgid "Show pickup notification"
 msgstr "Показать уведомление о подборе предмета"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:300
+#: src/gui/setup_video.cpp:301
 msgid "in chat"
 msgstr "в чате"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:303
 msgid "as particle"
 msgstr "как частицу"
 
-#: src/gui/setup_video.cpp:304
+#: src/gui/setup_video.cpp:305
 msgid "Enable opacity cache"
 msgstr "Включить кеш прозрачности"
 
-#: src/gui/setup_video.cpp:305
+#: src/gui/setup_video.cpp:306
 msgid "Enable map reduce"
 msgstr "Включить режим сжатия карты"
 
-#: src/gui/setup_video.cpp:307
-msgid "Show background"
-msgstr "Показать фон"
+#: src/gui/setup_video.cpp:308
+msgid "Auto adjust perfomance"
+msgstr "Автоматически подстраивать производительность"
+
+#: src/gui/setup_video.cpp:310
+msgid "Show beings transparency"
+msgstr "Отображать прозрачность на персонажах и монстрах"
 
-#: src/gui/setup_video.cpp:312
+#: src/gui/setup_video.cpp:315
 msgid "FPS limit:"
 msgstr "Ограничить кадр/с:"
 
-#: src/gui/setup_video.cpp:316 src/gui/setup_video.cpp:353
-#: src/gui/setup_video.cpp:596 src/gui/setup_video.cpp:748
+#: src/gui/setup_video.cpp:319 src/gui/setup_video.cpp:356
+#: src/gui/setup_video.cpp:607 src/gui/setup_video.cpp:760
 msgid "Alt FPS limit: "
 msgstr "Альтер. ограничить кадр/с: "
 
-#: src/gui/setup_video.cpp:325
+#: src/gui/setup_video.cpp:328
 msgid "Video"
 msgstr "Видео"
 
-#: src/gui/setup_video.cpp:331
+#: src/gui/setup_video.cpp:334
 msgid "Overhead text"
 msgstr "Текст над головами"
 
-#: src/gui/setup_video.cpp:332
+#: src/gui/setup_video.cpp:335
 msgid "Gui opacity"
 msgstr "Непрозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:333
+#: src/gui/setup_video.cpp:336
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/setup_video.cpp:334
+#: src/gui/setup_video.cpp:337
 msgid "Particle detail"
 msgstr "Детализация частиц"
 
-#: src/gui/setup_video.cpp:351 src/gui/setup_video.cpp:354
-#: src/gui/setup_video.cpp:595 src/gui/setup_video.cpp:735
-#: src/gui/setup_video.cpp:746
+#: src/gui/setup_video.cpp:354 src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:606 src/gui/setup_video.cpp:747
+#: src/gui/setup_video.cpp:758
 msgid "None"
 msgstr "Нет"
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:511
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
-"удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
+" удалось!"
 
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_video.cpp:517
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
 "также не удалось!"
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:528
 msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:529
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:534
+#: src/gui/setup_video.cpp:541
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:535
+#: src/gui/setup_video.cpp:542
 msgid "Applying change to OpenGL requires restart."
 msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
 
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_video.cpp:653
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
-#: src/gui/setup_video.cpp:642
+#: src/gui/setup_video.cpp:654
 msgid "Enter new resolution:                "
 msgstr "Новое разрешение:                   "
 
-#: src/gui/setup_video.cpp:657 src/gui/setup_video.cpp:662
+#: src/gui/setup_video.cpp:669 src/gui/setup_video.cpp:674
 msgid "Screen Resolution Changed"
 msgstr "Разрешение экрана изменено"
 
-#: src/gui/setup_video.cpp:660
+#: src/gui/setup_video.cpp:672
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
 "разрешении"
 
-#: src/gui/setup_video.cpp:693
+#: src/gui/setup_video.cpp:705
 msgid "Particle Effect Settings Changed."
 msgstr "Настройки эффектов частиц изменены."
 
-#: src/gui/setup_video.cpp:694
+#: src/gui/setup_video.cpp:706
 msgid "Changes will take effect on map change."
 msgstr "Изменения вступят в силу после загрузки новой карты."
 
@@ -3208,7 +3212,8 @@ msgid "Change"
 msgstr "Сменить"
 
 #: src/gui/tradewindow.cpp:332
-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 ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
@@ -3546,15 +3551,16 @@ msgstr "Команда: /ignore"
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
-"отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
+" отношений с ним."
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
 msgstr "Команда: /unignore <игрок>"
 
 #: 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 "Эта команда прекращает игнорирование другого игрока."
 
 #: src/gui/windowmenu.cpp:65
@@ -4788,494 +4794,4 @@ msgstr "Мана %+d"
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
-#~ msgid ""
-#~ "Access denied. Most likely, there are too many players on this server."
-#~ msgstr ""
-#~ "В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
-
-#~ msgid "Cannot use this ID."
-#~ msgstr "Нельзя использовать данный ID."
-
-#~ msgid "Unknown char-server failure."
-#~ msgstr "Неизвестная ошибка сервера персонажей."
-
-#~ msgid "Failed to create character. Most likely the name is already taken."
-#~ msgstr ""
-#~ "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
-
-#~ msgid "Wrong name."
-#~ msgstr "Некорректное имя."
-
-#~ msgid "Incorrect stats."
-#~ msgstr "Некорректные статы."
-
-#~ msgid "Incorrect hair."
-#~ msgstr "Некорректный тип волос."
-
-#~ msgid "Incorrect slot."
-#~ msgstr "Некорректный слот."
-
-#~ msgid "Character deleted."
-#~ msgstr "Персонаж удален"
-
-#~ msgid "Failed to delete character."
-#~ msgstr "Невозможно удалить персонажа."
-
-#~ msgid "Strength:"
-#~ msgstr "Сила (str):"
-
-#~ msgid "Agility:"
-#~ msgstr "Выносливость (agi):"
-
-#~ msgid "Vitality:"
-#~ msgstr "Живучесть (vit):"
-
-#~ msgid "Intelligence:"
-#~ msgstr "Интеллект (int):"
-
-#~ msgid "Dexterity:"
-#~ msgstr "Ловкость (dex):"
-
-#~ msgid "Luck:"
-#~ msgstr "Удача (luk):"
-
-#~ msgid "Whisper could not be sent, %s is offline."
-#~ msgstr "Сообщение не может быть отправлено, %s оффлайн."
-
-#~ msgid "Whisper could not be sent, ignored by %s."
-#~ msgstr "Приватное сообщение не может быть послано: %s игнорирует его."
-
-#~ msgid "MVP player."
-#~ msgstr "Игрок MVP."
-
-#~ msgid "MVP player: "
-#~ msgstr "Игрок MVP: "
-
-#~ msgid "Channels are not supported!"
-#~ msgstr "Каналы не поддерживаются!"
-
-#~ msgid "Online users: %d"
-#~ msgstr "Пользователей онлайн: %d"
-
-#~ msgid "Game"
-#~ msgstr "Игра"
-
-#~ msgid "Request to quit denied!"
-#~ msgstr "Запрос на выход отклонен!"
-
-#~ msgid "/help > Display this help."
-#~ msgstr "/help > Показать эту справку"
-
-#~ msgid "/invite > Invite a player to your guild"
-#~ msgstr "/invite > Пригласить игрока в Вашу гильдию"
-
-#~ msgid "/leave > Leave the guild you are in"
-#~ msgstr "/leave > Покинуть текущую гильдию"
-
-#~ msgid "/kick > Kick some one from the guild you are in"
-#~ msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
-
-#~ msgid "Command: /invite <nick>"
-#~ msgstr "Команда: /invite <игрок>"
-
-#~ msgid "This command invites <nick> to the guild you're in."
-#~ msgstr "Эта команда приглашает <имя персонажа> к Вам в группу."
-
-#~ msgid "Command: /leave"
-#~ msgstr "Команда: /leave"
-
-#~ msgid "This command causes the player to leave the guild."
-#~ msgstr "Эта команда заставляет игрока покинуть гильдию."
-
-#~ msgid "You are already in guild."
-#~ msgstr "Вы и так в гильдии"
-
-#~ msgid "Emperium check failed."
-#~ msgstr "Имперская проверка провалена"
-
-#~ msgid "Unknown server response."
-#~ msgstr "Неизвестный ответ сервера."
-
-#~ msgid "Guild name: %s"
-#~ msgstr "Имя гильдии: %s"
-
-#~ msgid "Guild master: %s"
-#~ msgstr "Мастер гильдии: %s"
-
-#~ msgid "Guild level: %d"
-#~ msgstr "Уровень гильдии: %d"
-
-#~ msgid "Online members: %d"
-#~ msgstr "Пользователей онлайн: %d"
-
-#~ msgid "Max members: %d"
-#~ msgstr "Макс. членов: %d"
-
-#~ msgid "Average level: %d"
-#~ msgstr "Средний уровень: %d"
-
-#~ msgid "Guild exp: %d"
-#~ msgstr "Опыт гильдии: %d"
-
-#~ msgid "Guild next exp: %d"
-#~ msgstr "Нужно опыта до следующего уровня: %d"
-
-#~ msgid "Guild castle: %s"
-#~ msgstr "Замки: %s"
-
-#~ msgid "Could not inivte user to guild."
-#~ msgstr "Не удалось пригласить пользователя в гиьдию."
-
-#~ msgid "User rejected guild invite."
-#~ msgstr "Пользователь отклонил приглашение."
-
-#~ msgid "User is now part of your guild."
-#~ msgstr "Пользователь теперь в Вашей гильдии."
-
-#~ msgid "Your guild is full."
-#~ msgstr "Ваша гильдия полна."
-
-#~ msgid "Unknown guild invite response."
-#~ msgstr "Неизвестный ответ на приглашение в гильдию."
-
-#~ msgid "You have left the guild."
-#~ msgstr "Вы покинули гильдию."
-
-#~ msgid "%s has left your guild."
-#~ msgstr "%s покинул Вашу гильдию."
-
-#~ msgid "You was kicked from guild."
-#~ msgstr "Вы были кикнуты из гильдии."
-
-#~ msgid "%s has kicked from your guild."
-#~ msgstr "%s был вышвырнут из Вашей гильдии."
-
-#~ msgid "/invite > Invite a player to your party"
-#~ msgstr "/invite > Пригласить игрока в Вашу группу"
-
-#~ msgid "/leave > Leave the party you are in"
-#~ msgstr "/leave > Покинуть текущую группу"
-
-#~ msgid "/kick > Kick some one from the party you are in"
-#~ msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
-
-#~ msgid "/item > Show/change party item sharing options"
-#~ msgstr ""
-#~ "/item > Показать/Скрыть текущее состояние распределения предметов в группе"
-
-#~ msgid "/exp > Show/change party experience sharing options"
-#~ msgstr ""
-#~ "/exp > Показать/Скрыть текущее состояние распределения опыта в группе"
-
-#~ msgid "This command invites <nick> to party with you."
-#~ msgstr "Эта команда приглашает <имя персонажа> к вам в группу."
-
-#~ msgid "This command causes the player to leave the party."
-#~ msgstr "Эта команда заставляет игрока покинуть группу"
-
-#~ msgid "Command: /item <policy>"
-#~ msgstr "Команда: /item <политика разделения предметов>"
-
-#~ msgid "This command changes the party's item sharing policy."
-#~ msgstr "Команда изменяет политику разделения предетов между ченами группы."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, "
-#~ "or \"0\", \"no\", \"false\" to disable item sharing."
-#~ msgstr ""
-#~ "<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
-#~ "или \"0\", \"no\", \"false\" -- для выключения."
-
-#~ msgid "Command: /item"
-#~ msgstr "Команда: /item"
-
-#~ msgid "This command displays the party's current item sharing policy."
-#~ msgstr ""
-#~ "Отображает текущую политику разделения предметов между членами группы."
-
-#~ msgid "Command: /exp <policy>"
-#~ msgstr "Команда: /exp <политика распределения опыта>"
-
-#~ msgid "This command changes the party's experience sharing policy."
-#~ msgstr "Эта команда изменяет политику распределения опыта в группе."
-
-#~ msgid ""
-#~ "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-#~ "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-#~ msgstr ""
-#~ "<policy> может быть одним из \"1\", \"yes\", \"true\" - чтобы разрешить "
-#~ "общий опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
-
-#~ msgid "Command: /exp"
-#~ msgstr "Команда: /exp"
-
-#~ msgid "This command displays the party's current experience sharing policy."
-#~ msgstr "Эта команда отображает текущую политику обмена опытом."
-
-#~ msgid "Item sharing enabled."
-#~ msgstr "Обмен предметами включен"
-
-#~ msgid "Item sharing disabled."
-#~ msgstr "Обмен предметами выключен"
-
-#~ msgid "Item sharing not possible."
-#~ msgstr "Обмен предметами невозможен."
-
-#~ msgid "Item sharing unknown."
-#~ msgstr "Статус обмена предметами неизвестен."
-
-#~ msgid "Experience sharing enabled."
-#~ msgstr "Обмен опытом вклыючен."
-
-#~ msgid "Experience sharing disabled."
-#~ msgstr "Обмен опытом выкючен."
-
-#~ msgid "Experience sharing not possible."
-#~ msgstr "Обмен опытом невозможен."
-
-#~ msgid "Experience sharing unknown."
-#~ msgstr "Политика распределения опыта неизвестна."
-
-#~ msgid "Failed to use item."
-#~ msgstr "Не удалось использовать предмет."
-
-#~ msgid "Unable to equip."
-#~ msgstr "Нельзя экипировать!"
-
-#~ msgid "Account was not found. Please re-login."
-#~ msgstr "Учетная запись не найдена. Попробуйте снова."
-
-#~ msgid "New password too short."
-#~ msgstr "Новый пароль слишком короткий."
-
-#~ msgid "Unregistered ID."
-#~ msgstr "Незарегистрированный ID"
-
-#~ msgid "Wrong password."
-#~ msgstr "Неверный пароль"
-
-#~ msgid "Account expired."
-#~ msgstr "Учетная запись просрочена."
-
-#~ msgid "Rejected from server."
-#~ msgstr "Получен отказ от сервера.."
-
-#~ msgid ""
-#~ "You have been permanently banned from the game. Please contact the GM "
-#~ "team."
-#~ msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов."
-
-#~ msgid "Client too old."
-#~ msgstr "Клиент устарел"
-
-#~ msgid ""
-#~ "You have been temporarily banned from the game until %s.\n"
-#~ "Please contact the GM team via the forums."
-#~ msgstr ""
-#~ "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
-
-#~ msgid "Server overpopulated."
-#~ msgstr "Сервер переполнен"
-
-#~ msgid "This user name is already taken."
-#~ msgstr "Это имя пользователя уже занято."
-
-#~ msgid "Username permanently erased."
-#~ msgstr "Пользователь удален"
-
-#~ msgid "Could not create party."
-#~ msgstr "Не удалось создать группу."
-
-#~ msgid "Party successfully created."
-#~ msgstr "Группа успешно создана."
-
-#~ msgid "%s has joined your party."
-#~ msgstr "%s присоединился к группе."
-
-#~ msgid "%s is already a member of a party."
-#~ msgstr "%s уже в Вашей группе."
-
-#~ msgid "%s refused your invitation."
-#~ msgstr "%s отверг Ваше приглашение."
-
-#~ msgid "%s is now a member of your party."
-#~ msgstr "%s теперь в Вашей группе."
-
-#~ msgid "%s can't join your party because party is full."
-#~ msgstr "%s не может присоединиться к Вашей группе, т.к. группа переполнена."
-
-#~ msgid "QQQ Unknown invite response for %s."
-#~ msgstr "QQQ Неизвестный ответ на приглашение для %s"
-
-#~ msgid "You have left the party."
-#~ msgstr "Вы покинули группу."
-
-#~ msgid "%s has left your party."
-#~ msgstr "%s покинул Вашу группу."
-
-#~ msgid "An unknown member tried to say: %s"
-#~ msgstr "Неизвестный участник попытался сказать: %s"
-
-#~ msgid "Insert coin to continue."
-#~ msgstr "Опустите монетку для продолжения."
-
-#~ msgid "You're not dead yet. You're just resting."
-#~ msgstr "Вы не мертвы. Вы просто отдыхаете."
-
-#~ msgid "You are no more."
-#~ msgstr "Вас больше нет."
-
-#~ msgid "You have ceased to be."
-#~ msgstr "Вы перестали быть."
-
-#~ msgid "You've expired and gone to meet your maker."
-#~ msgstr "Ваше время истекло, пора встретиться с Создателем."
-
-#~ msgid "You're a stiff."
-#~ msgstr "Вы сдулись."
-
-#~ msgid "Bereft of life, you rest in peace."
-#~ msgstr "Лишенный жизни, покойся с миром."
-
-#~ msgid "If you weren't so animated, you'd be pushing up the daisies."
-#~ msgstr "Если бы Вы не были нарисованными, Вы бы отправлись на тот свет"
-
-#~ msgid "Your metabolic processes are now history."
-#~ msgstr "Ваш обмен веществ стал историей."
-
-#~ msgid "You're off the twig."
-#~ msgstr "Вы упали с ветки."
-
-#~ msgid "You've kicked the bucket."
-#~ msgstr "Вы протянули ноги."
-
-#~ msgid ""
-#~ "You've shuffled off your mortal coil, run down the curtain and joined the "
-#~ "bleedin' choir invisibile."
-#~ msgstr ""
-#~ "Вы затаскали свою смертную оболочку, сорвали занавес и незримо "
-#~ "присоединились к кровоточащему хору..."
-
-#~ msgid "You are an ex-player."
-#~ msgstr "Вы не жилец."
-
-#~ msgid "You're pining for the fjords."
-#~ msgstr "Вас пришпиливают к фьордам."
-
-#~ msgid "Message"
-#~ msgstr "Сообщение"
-
-#~ msgid ""
-#~ "You are carrying more than half your weight. You are unable to regain "
-#~ "health."
-#~ msgstr ""
-#~ "Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье "
-#~ "восстанавливаться не будет."
-
-#~ msgid "You are carrying less than half your weight. You can regain health."
-#~ msgstr ""
-#~ "Вес предметов составляет менее половины допустимого. Теперь Вы можете "
-#~ "восстанавливаться."
-
-#~ msgid "You picked up %s."
-#~ msgstr "Вы получили %s."
-
-#~ msgid "You spent %s."
-#~ msgstr "Вы потратили %s."
-
-#~ msgid "Cannot raise skill!"
-#~ msgstr "Не удалось увеличить навык!"
-
-#~ msgid "Equip arrows first."
-#~ msgstr "Для начала экипируйтесь стрелами!"
-
-#~ msgid "Trade failed!"
-#~ msgstr "Не удалось начать торговлю!"
-
-#~ msgid "Emote failed!"
-#~ msgstr "Не удалось использовать смайлик!"
-
-#~ msgid "Sit failed!"
-#~ msgstr "Не удалось присесть!"
-
-#~ msgid "Chat creating failed!"
-#~ msgstr "Не удалось создать чат!"
-
-#~ msgid "Could not join party!"
-#~ msgstr "Нельзя присоединиться к группе!"
-
-#~ msgid "Cannot shout!"
-#~ msgstr "Нельзя кричать!"
-
-#~ msgid "You have not yet reached a high enough lvl!"
-#~ msgstr "У Вас недостаточный уровень!"
-
-#~ msgid "Insufficient HP!"
-#~ msgstr "Недостаточно ОЖ!"
-
-#~ msgid "Insufficient SP!"
-#~ msgstr "Недостаточно Маны"
-
-#~ msgid "You have no memos!"
-#~ msgstr "У Вас нет записей!"
-
-#~ msgid "You cannot do that right now!"
-#~ msgstr "Вы не можете сделать это сейчас!"
-
-#~ msgid "Seems you need more money... ;-)"
-#~ msgstr "Похоже, Вам нужно боьше денег... ;-)"
-
-#~ msgid "You cannot use this skill with that kind of weapon!"
-#~ msgstr "Вы не можете использовать это умение с этим видом оружия!"
-
-#~ msgid "You need another red gem!"
-#~ msgstr "Вам нужен другой красный камень!"
-
-#~ msgid "You need another blue gem!"
-#~ msgstr "Вам нужен другой синий камень!"
-
-#~ msgid "You're carrying to much to do this!"
-#~ msgstr "Вы несёте слишком много, чтобы сделать это!"
-
-#~ msgid "Huh? What's that?"
-#~ msgstr "А? Что это?"
-
-#~ msgid "Warp failed..."
-#~ msgstr "Изменение не удалось..."
-
-#~ msgid "Could not steal anything..."
-#~ msgstr "Не удалось ничего украсть..."
-
-#~ msgid "Poison had no effect..."
-#~ msgstr "Яд не подействовал..."
-
-#~ msgid "Trading isn't possible. Trade partner is too far away."
-#~ msgstr "Торговля невозможна. Партнер по торговле слишком далеко."
-
-#~ msgid "Trading isn't possible. Character doesn't exist."
-#~ msgstr "Торговля невозможна. Такой персонаж не существует."
-
-#~ msgid "Trade cancelled due to an unknown reason."
-#~ msgstr "Торговля отменена по неизвестной причине."
-
-#~ msgid "Trade: You and %s"
-#~ msgstr "Торговля: Вы и %s"
-
-#~ msgid "Trade with %s cancelled."
-#~ msgstr "Торговля с %s отменена."
-
-#~ msgid "Unhandled trade cancel packet."
-#~ msgstr "Неизвестный сигнал завершения торговли."
-
-#~ msgid "Failed adding item. Trade partner is over weighted."
-#~ msgstr "Не удалось добавить предмет. Партнер по торговле перегружен."
-
-#~ msgid "Failed adding item. Trade partner has no free slot."
-#~ msgstr ""
-#~ "Не удалось добавить предмет. У партнера по торговле кончилось место."
-
-#~ msgid "Failed adding item. You can't trade this item."
-#~ msgstr "Ошибка добавления предмета. Вы не можете торговать этим предметом."
 
-#~ msgid "Failed adding item for unknown reason."
-#~ msgstr "Не удалось добавить предмет по неизвестной причине."