Rebuild translations and update ru translation.

author: Andrei Karas <akaras@inbox.ru> 2011-11-12 00:56:25 +0300
committer: Andrei Karas <akaras@inbox.ru> 2011-11-12 00:56:25 +0300
commit: 1c1232094c3f54b0a7b109b23e0754095ed29cd7 (patch)
tree: e7a025559262a13a7d178b25f89fd51dc2642a26
parent: ab165386008a2b19e997d91fffe634d3145d27b8 (diff)
download: manaverse-1c1232094c3f54b0a7b109b23e0754095ed29cd7.tar.gz
manaverse-1c1232094c3f54b0a7b109b23e0754095ed29cd7.tar.bz2
manaverse-1c1232094c3f54b0a7b109b23e0754095ed29cd7.tar.xz
manaverse-1c1232094c3f54b0a7b109b23e0754095ed29cd7.zip
14 files changed, 2747 insertions, 2535 deletions
diff --git a/po/cs.po b/po/cs.po
index 9288981c2..1cbe2d6e0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Pitriss <chytrex@wjake.com>, 2011.
@@ -10,80 +10,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
-"cs/)\n"
-"Language: cs\n"
+"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "úskočil"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Výkon"
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Požaduji postavy"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Zaměňuji herní servery"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +92,50 @@ msgstr "Zaměňuji herní servery"
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Změna hesla"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "Změna emailu"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Neplatný host updatů: %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
@@ -152,8 +151,8 @@ msgstr "Nelze zaslat prázdné šeptání!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "Nelze vytvořit záložku se šeptáním pro \"%s\"! Buďto záložka existuje nebo "
 "jsi to ty."
@@ -333,35 +332,35 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Snímky obrazovky ukládat jako "
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "Nelze načíst mapu"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
@@ -439,7 +438,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr ""
 
@@ -447,7 +446,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr ""
 
@@ -459,8 +458,8 @@ msgid "Quit"
 msgstr "Ukončit"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Vše"
 
@@ -734,10 +733,11 @@ msgstr "duhová 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1379,7 +1379,7 @@ msgstr "Odignorovat"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -1634,13 +1634,13 @@ msgstr "Zobrazit"
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr ""
 
@@ -1962,28 +1962,32 @@ msgstr "Použít"
 msgid "Reset Windows"
 msgstr "Resetovat okna"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Stiskněte tlačítko pro zahájení kalibrace"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibrovat"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Zapnout joystick"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Zastavit"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -3148,181 +3152,181 @@ msgstr "Modifikátory hry jsou vypnuty"
 msgid "Game modifiers are enabled"
 msgstr "Modifikátory hry jsou zapnuty"
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Peníze: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Práce: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Práce:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr "Bodů postavy: %d"
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Úroveň: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr " (2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3452,7 +3456,8 @@ msgid "You don't have enough money."
 msgstr "Nemáte dost peněz."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3472,21 +3477,21 @@ msgstr "Připojuji se..."
 msgid "Play"
 msgstr "Hrát"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces aktualizace není kompletní."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1  silně doporučujeme zkusit"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr "##1  aktualizaci později"
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Hotovo"
 
@@ -3830,7 +3835,8 @@ msgid "Command: /unignore <player>"
 msgstr ""
 
 #: 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
@@ -4360,41 +4366,41 @@ msgstr ""
 "Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
 "chovat podivně."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr "Zabil vás "
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4402,27 +4408,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr "Vidíte "
 
@@ -4556,7 +4562,8 @@ msgstr "Štěstí:"
 
 #: src/net/ea/charserverhandler.cpp:102
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Přístup zamítnut. Nejpravděpodobněji je na serveru příliš mnoho hráčů."
+msgstr ""
+"Přístup zamítnut. Nejpravděpodobněji je na serveru příliš mnoho hráčů."
 
 #: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
@@ -5005,8 +5012,8 @@ msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
-"Ne, děti. Vaše postava ve skutečnosti neumřela. Ona.. errm.. odešla na lepší "
-"místo."
+"Ne, děti. Vaše postava ve skutečnosti neumřela. Ona.. errm.. odešla na lepší"
+" místo."
 
 #: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
 msgid ""
@@ -5104,8 +5111,10 @@ msgstr "Zpráva"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "Nesete více než polovinu vaší váhy. Obnovování života nyní není možné."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+"Nesete více než polovinu vaší váhy. Obnovování života nyní není možné."
 
 #: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
@@ -5679,15 +5688,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
@@ -5696,19 +5705,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr ""
 
@@ -5740,3 +5749,5 @@ msgstr ""
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Neznámý předmět"
+
+
diff --git a/po/de.po b/po/de.po
index 8275017be..ae6f34c90 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <clos3rlook@gmail.com>, 2011.
@@ -12,80 +12,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
-"de/)\n"
-"Language: de\n"
+"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Spielfiguren werden angefragt"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +94,50 @@ msgstr "Charakterserver wechseln"
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Passwort ändern"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -155,11 +154,11 @@ msgstr "Kann keine leeren Nachrichten versenden!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
-"oder du bist es selbst."
+"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits,"
+" oder du bist es selbst."
 
 #: src/commandhandler.cpp:363
 #, c-format
@@ -321,8 +320,7 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 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\"."
+msgstr "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -332,35 +330,35 @@ msgstr "Allgemein"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Bildschirmfoto gespeichert unter"
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden."
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -438,7 +436,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -446,7 +444,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -458,8 +456,8 @@ msgid "Quit"
 msgstr "Beenden"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Max"
 
@@ -733,10 +731,11 @@ msgstr "Regenbogen 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1376,7 +1375,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
@@ -1631,13 +1630,13 @@ msgstr ""
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr ""
 
@@ -1960,29 +1959,33 @@ msgstr "Anwenden"
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibrieren"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Joystick aktivieren"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Kreise den Steuerknüppel"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -3151,181 +3154,181 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr ""
 
@@ -3455,10 +3458,11 @@ msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
-"Gegenstände hinzufügen."
+"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser"
+" Gegenstände hinzufügen."
 
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
@@ -3477,21 +3481,21 @@ msgstr "Verbinde..."
 msgid "Play"
 msgstr "Los!"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Fertig"
 
@@ -3839,7 +3843,8 @@ msgid "Command: /unignore <player>"
 msgstr "Befehl: /unignore <Spieler>"
 
 #: 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
@@ -4367,68 +4372,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "Folgen:"
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr "Du siehst"
 
@@ -5018,8 +5023,8 @@ msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
-"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
-"nicht ganz so genial, wie Du dachtest..."
+"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider"
+" nicht ganz so genial, wie Du dachtest..."
 
 #: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
@@ -5109,7 +5114,8 @@ msgstr "Nachricht"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:346
@@ -5687,15 +5693,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr "Empty address given to Network::connect()!"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr "Nicht möglich den host \" aufzulösen"
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr "Verbindung mit Server abgebrochen. "
 
@@ -5704,19 +5710,19 @@ msgstr "Verbindung mit Server abgebrochen. "
 msgid "%s is not in your party!"
 msgstr "%s ist nicht in Deiner Party!"
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr "Drucke '..'"
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr "Blinkender Name"
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr "Schwebende '...' Blase"
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr "Schwebende Blase"
 
@@ -5748,3 +5754,5 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
+
+
diff --git a/po/es.po b/po/es.po
index a19942550..528ba58fe 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
@@ -12,80 +12,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"manaplus/team/es/)\n"
-"Language: es\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/manaplus/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Rendimiento"
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +94,50 @@ msgstr "Cambiando servidores del juego"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
@@ -154,8 +153,8 @@ msgstr "¡No puedes enviar susurros vacíos!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
@@ -239,7 +238,7 @@ msgstr "en la lista negra"
 
 #: src/commandhandler.cpp:594
 msgid "enemy"
-msgstr ""
+msgstr "enemigo"
 
 #: src/commandhandler.cpp:609
 msgid "Player already erased!"
@@ -320,8 +319,7 @@ msgstr "Imágenes de recurso huérfano:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
+msgstr "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -331,35 +329,35 @@ msgstr "General"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -437,7 +435,7 @@ msgstr "Cantidad:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -445,7 +443,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -457,8 +455,8 @@ msgid "Quit"
 msgstr "Salir"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Máximo"
 
@@ -732,10 +730,11 @@ msgstr "arco iris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1347,7 +1346,7 @@ msgstr "Lista negra"
 #: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
 #: src/gui/popupmenu.cpp:666
 msgid "Set as enemy"
-msgstr ""
+msgstr "Establecer como enemigo"
 
 #: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
@@ -1375,7 +1374,7 @@ msgstr "Des-ignorar"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1630,13 +1629,13 @@ msgstr "Mostrar"
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1959,29 +1958,33 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Presiona el botón para empezar la calibración"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Gira el stick"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2165,7 +2168,7 @@ msgstr "Habilitar el control de robot"
 
 #: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+msgstr "Activar la protección de servidores con errores (no deshabilitar)"
 
 #: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
@@ -2309,7 +2312,7 @@ msgstr "En la lista negra"
 
 #: src/gui/setup_relations.cpp:76
 msgid "Enemy"
-msgstr ""
+msgstr "Enemigo"
 
 #: src/gui/setup_relations.cpp:240
 msgid "Allow trading"
@@ -2357,55 +2360,55 @@ msgstr "Enorme (15)"
 
 #: src/gui/setup_theme.cpp:146
 msgid "Chinese (China)"
-msgstr ""
+msgstr "Chino (China)"
 
 #: src/gui/setup_theme.cpp:147
 msgid "Czech"
-msgstr ""
+msgstr "Checo"
 
 #: src/gui/setup_theme.cpp:148
 msgid "English"
-msgstr ""
+msgstr "Inglés"
 
 #: src/gui/setup_theme.cpp:149
 msgid "Finnish"
-msgstr ""
+msgstr "Finlandés"
 
 #: src/gui/setup_theme.cpp:150
 msgid "French"
-msgstr ""
+msgstr "Francés"
 
 #: src/gui/setup_theme.cpp:151
 msgid "German"
-msgstr ""
+msgstr "Alemán"
 
 #: src/gui/setup_theme.cpp:152
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonesio"
 
 #: src/gui/setup_theme.cpp:153
 msgid "Japanese"
-msgstr ""
+msgstr "Japonés"
 
 #: src/gui/setup_theme.cpp:154
 msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+msgstr "Holanda (Bélgica/Flandes)"
 
 #: src/gui/setup_theme.cpp:155
 msgid "Portuguese"
-msgstr ""
+msgstr "Portugués"
 
 #: src/gui/setup_theme.cpp:156
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Portugués (Brasileño)"
 
 #: src/gui/setup_theme.cpp:157
 msgid "Russian"
-msgstr ""
+msgstr "Ruso"
 
 #: src/gui/setup_theme.cpp:158
 msgid "Spanish (Castilian)"
-msgstr ""
+msgstr "Español (Castellano)"
 
 #: src/gui/setup_theme.cpp:190
 msgid "Theme"
@@ -2417,7 +2420,7 @@ msgstr "Tema de interfáz gráfica"
 
 #: src/gui/setup_theme.cpp:193
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #: src/gui/setup_theme.cpp:194
 msgid "Main Font"
@@ -3083,23 +3086,23 @@ msgstr "(?) ataque mágico"
 
 #: src/gui/statuspopup.cpp:489
 msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) atacar a todos los jugadores"
 
 #: src/gui/statuspopup.cpp:493
 msgid "(f) attack not friends"
-msgstr ""
+msgstr "(f) atacar a los que no son amigos"
 
 #: src/gui/statuspopup.cpp:497
 msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) atacar a quienes están en malas relaciones"
 
 #: src/gui/statuspopup.cpp:501
 msgid "(d) dont attack players"
-msgstr ""
+msgstr "(d) no atacar a los jugadores"
 
 #: src/gui/statuspopup.cpp:505
 msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) ataque pvp"
 
 #: src/gui/statuspopup.cpp:514
 msgid "(D) default imitation"
@@ -3145,181 +3148,181 @@ msgstr "Modificadores del juego están deshabilitados"
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "PV:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "PM:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Trabajo: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Trabajo:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr "Puntos del personaje: %d"
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivel: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr "Puntos de corrección: %d"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3449,7 +3452,8 @@ msgid "You don't have enough money."
 msgstr "No tienes dinero suficiente."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
@@ -3471,21 +3475,21 @@ msgstr "Conectando..."
 msgid "Play"
 msgstr "Jugar"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1  El proceso de actualización esta incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr "##1 lo intentes de nuevo más tarde."
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Completado"
 
@@ -3833,7 +3837,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jugador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando para de ignorar al jugador si está siendo ignorado."
 
 #: src/gui/windowmenu.cpp:65
@@ -4308,7 +4313,7 @@ msgstr "Intercambiar ataque mágico"
 
 #: src/keyboardconfig.cpp:329
 msgid "Switch pvp attack"
-msgstr ""
+msgstr "Intercambiar ataque pvp"
 
 #: src/keyboardconfig.cpp:330
 msgid "Change move type"
@@ -4363,68 +4368,68 @@ msgstr ""
 "Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
 msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr "Ves "
 
@@ -4818,8 +4823,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<política> puede ser \"1\", \"yes\" y \"true\" para compartir experiencia, o "
-"\"0\", \"no\" y \"false\" para no compartir."
+"<política> puede ser \"1\", \"yes\" y \"true\" para compartir experiencia, o"
+" \"0\", \"no\" y \"false\" para no compartir."
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4910,8 +4915,8 @@ msgstr "Rechazado del servidor."
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
-"GM."
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo"
+" GM."
 
 #: src/net/ea/loginhandler.cpp:219
 msgid "Client too old."
@@ -5118,7 +5123,8 @@ msgstr "Mensaje"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
 #: src/net/ea/playerhandler.cpp:346
@@ -5699,15 +5705,15 @@ msgstr "Alcance de Ataque"
 msgid "Damage per sec."
 msgstr "Daño por segundo."
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr "Adress vacía enviada a Network::connect()!"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr "No es posible determinar el host \""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr "Conexión al servidor terminada."
 
@@ -5716,19 +5722,19 @@ msgstr "Conexión al servidor terminada."
 msgid "%s is not in your party!"
 msgstr "%s no está en tu grupo!"
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr "Parpadear nombre"
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr "Burbuja '...' flotante"
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr "Burbuja Flotante"
 
@@ -5760,3 +5766,5 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Objeto desconocido"
+
+
diff --git a/po/fi.po b/po/fi.po
index 8483f673a..0b3eecbeb 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011.
@@ -9,79 +9,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: 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:1171
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Kuva"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -91,50 +91,50 @@ msgstr "Vaihdan pelipalvelinta"
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, 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."
@@ -150,11 +150,11 @@ msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"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:363
 #, c-format
@@ -317,8 +317,8 @@ 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:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -328,35 +328,35 @@ msgstr "Yleiset"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -434,7 +434,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -442,7 +442,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -454,8 +454,8 @@ msgid "Quit"
 msgstr "Sulje"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Max"
 
@@ -729,10 +729,11 @@ msgstr "sateenkaari 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1372,7 +1373,7 @@ msgstr "Huomioi jälleen"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -1627,13 +1628,13 @@ msgstr "Näytä"
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1790,8 +1791,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"
@@ -1956,29 +1957,33 @@ msgstr "Hyväksy"
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibroi"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Ota peliohjain käyttöön"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Peliohjain"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Lopeta"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Pyöräytä ohjainta ääriasennoissaan"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2561,7 +2566,8 @@ msgstr "-"
 #: src/gui/setup_video.cpp:484
 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:490
 msgid ""
@@ -3140,181 +3146,181 @@ msgstr "Pelimuokkaimet poissa käytöstä"
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Rahat: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "VP:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Kok:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Työ: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Työ:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr "Hahmopisteitä: %d"
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Taso: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr "Korjauspisteitä: %d"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3444,7 +3450,8 @@ msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3464,21 +3471,21 @@ msgstr "Yhdistetään..."
 msgid "Play"
 msgstr "Pelaa"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitysprosessi keskeytyi"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Suosittelemme vahvasti että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen"
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Valmis"
 
@@ -3826,7 +3833,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."
 
@@ -4357,68 +4365,68 @@ msgstr ""
 "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
 "ole hyvä ja poista päällekkäisyydet. "
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr "Sinut otti hengiltä "
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit nostaa olemattoman tavaran."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran nostamisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr "Näet "
 
@@ -4565,7 +4573,8 @@ msgstr "Tuntematon hahmopalvelinvirhe."
 
 #: src/net/ea/charserverhandler.cpp:138
 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ä."
+msgstr ""
+"Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
 
 #: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
@@ -5107,8 +5116,10 @@ msgstr "Viesti"
 
 #: src/net/ea/playerhandler.cpp:336
 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."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+"Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
 #: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
@@ -5687,15 +5698,15 @@ msgstr "Hyökkäyskantama"
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr "Tyhjä osoite Network::connect()-pyynnössä!"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr "Osoitetta ei löydy: \""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr "Yhteys palvelimeen katkaistu. "
 
@@ -5704,19 +5715,19 @@ msgstr "Yhteys palvelimeen katkaistu. "
 msgid "%s is not in your party!"
 msgstr "%s ei ole ryhmässäsi!"
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr "Tulosta '...'"
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr "Vilkuta nimeä"
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr "Leijuva '...' -puhekupla"
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr "Leijuva puhekupla"
 
@@ -5748,3 +5759,5 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
+
+
diff --git a/po/fr.po b/po/fr.po
index dc2a98c72..177f9dcaf 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.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <antoinebcn@hotmail.com>, 2011.
@@ -12,80 +12,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: 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:1171
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "esquivé"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr "Thèmes"
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +94,50 @@ msgstr "Changement de serveur de jeu"
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -155,11 +154,11 @@ msgstr "Vous ne pouvez pas envoyer de messages vides."
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"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:363
 #, c-format
@@ -322,8 +321,7 @@ 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:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -333,36 +331,36 @@ msgstr "Général"
 msgid "Debug"
 msgstr "Informations"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 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:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -440,7 +438,7 @@ msgstr "Montant"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -448,7 +446,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -460,8 +458,8 @@ msgid "Quit"
 msgstr "Quitter"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Max."
 
@@ -735,10 +733,11 @@ msgstr "arc en ciel 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1378,7 +1377,7 @@ msgstr "Ne plus ignorer"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -1633,13 +1632,13 @@ msgstr "Montrer"
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1961,29 +1960,33 @@ msgstr "Appliquer"
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibrer"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Activer la manette de jeu"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Manette"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Tourner la manette de jeu"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2155,7 +2158,8 @@ msgstr "Activer le support pour auction bot"
 
 #: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Activer le support pour guild bot et désactiver le support par défault"
+msgstr ""
+"Activer le support pour guild bot et désactiver le support par défault"
 
 #: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
@@ -2200,7 +2204,8 @@ msgstr "Accélération matériel"
 #: src/gui/setup_perfomance.cpp:64
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
-"Autoriser l'opacité du cache (Le programme peut utiliser beaucoup de mémoire)"
+"Autoriser l'opacité du cache (Le programme peut utiliser beaucoup de "
+"mémoire)"
 
 #: src/gui/setup_perfomance.cpp:67
 msgid "Enable map reduce (Software)"
@@ -2837,8 +2842,8 @@ msgstr "Choisissez le nom de la guilde."
 #: src/gui/socialwindow.cpp:1425
 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:1431
 #, c-format
@@ -3158,181 +3163,181 @@ msgstr "Modificateurs de mode de jeu désactivés"
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "Vie :"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Exp :"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "PM :"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Métier : %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Compétences :"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr "Points de caractéristiques du personnage : %d"
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau : %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr "Points de correction : %d"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3462,7 +3467,8 @@ msgid "You don't have enough money."
 msgstr "Vous n'avez pas assez d'argent."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
@@ -3484,21 +3490,21 @@ msgstr "Connexion..."
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr "##1 Essayez à nouveau plus tard"
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Terminé"
 
@@ -3700,7 +3706,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>"
@@ -3850,8 +3857,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"
@@ -4380,68 +4389,68 @@ msgstr ""
 "Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
 "touches ou attendez vous à un possible comportement étrange du jeu."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr "Vous avez été tué par "
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
 msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr "Vous voyez  "
 
@@ -4534,7 +4543,8 @@ msgstr ""
 
 #: src/main.cpp:72
 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:73
 msgid "     --safemode       : Start game in safe mode"
@@ -5149,10 +5159,11 @@ msgstr "Message"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
-"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
-"en mesure de regagner vos points de vie."
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus"
+" en mesure de regagner vos points de vie."
 
 #: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
@@ -5740,15 +5751,15 @@ msgstr "Portée de l'attaque"
 msgid "Damage per sec."
 msgstr "Dommage par s."
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr "Impossible de connecter au serveur \""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr "Connexion au serveur terminée."
 
@@ -5757,19 +5768,19 @@ msgstr "Connexion au serveur terminée."
 msgid "%s is not in your party!"
 msgstr "%s n'est pas membre de votre groupe !"
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr "Affiche '...'"
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr "Fais clignoter le nom"
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr "Bulle flottante '...'"
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr "Bulle flottante"
 
@@ -5801,3 +5812,5 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Objet inconnu"
+
+
diff --git a/po/id.po b/po/id.po
index 2af9b5ebf..b617f51cf 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.
-#
+# 
 # Translators:
 #   <adjieps@yahoo.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
@@ -10,80 +10,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-10-28 00:55+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
-"id/)\n"
-"Language: id\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:1171
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +92,50 @@ msgstr "Pergantian server"
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -152,8 +151,8 @@ msgstr "Tidak dapat mengirimkan pesan tanpa nama"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
 "atau nama anda sendiri"
@@ -313,8 +312,7 @@ 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:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -324,35 +322,35 @@ msgstr "Umum"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -430,7 +428,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -438,7 +436,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -450,8 +448,8 @@ msgid "Quit"
 msgstr "Keluar"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Max"
 
@@ -725,10 +723,11 @@ msgstr "pelangi 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1366,7 +1365,7 @@ msgstr "Batalkan pengabaian"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr ""
 
@@ -1621,13 +1620,13 @@ msgstr "Tampilkan"
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(kembalikan)"
 
@@ -1948,29 +1947,33 @@ msgstr "Terapkan"
 msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibrasi"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Membolehkan joistik"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Berhenti"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Putar stik"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -3080,14 +3083,12 @@ msgid "(b) attack bad relations"
 msgstr ""
 
 #: src/gui/statuspopup.cpp:501
-#, fuzzy
 msgid "(d) dont attack players"
-msgstr "Tambahkan ke daftar menyerang"
+msgstr ""
 
 #: src/gui/statuspopup.cpp:505
-#, fuzzy
 msgid "(?) pvp attack"
-msgstr "(?)serangan"
+msgstr ""
 
 #: src/gui/statuspopup.cpp:514
 msgid "(D) default imitation"
@@ -3133,181 +3134,181 @@ msgstr "Perombakan game tidak diperbolehkan"
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(l)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3437,7 +3438,8 @@ msgid "You don't have enough money."
 msgstr "Anda tidak memiliki cukup uang."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3457,21 +3459,21 @@ msgstr "Menyambung..."
 msgid "Play"
 msgstr "Main"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr ""
 
@@ -3815,7 +3817,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
@@ -4289,9 +4292,8 @@ msgid "Switch magic attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:329
-#, fuzzy
 msgid "Switch pvp attack"
-msgstr "Ganti Karakter"
+msgstr ""
 
 #: src/keyboardconfig.cpp:330
 msgid "Change move type"
@@ -4344,67 +4346,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr ""
 
@@ -5078,7 +5080,8 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:346
@@ -5655,15 +5658,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
@@ -5672,19 +5675,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr ""
 
@@ -5716,3 +5719,5 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr ""
+
+
diff --git a/po/it.po b/po/it.po
index 2b97341c1..6607a008d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-11-03 15:03+0000\n"
-"Last-Translator: WildX <guglielmo__@hotmail.it>\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,65 +25,65 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:852
+#: src/client.cpp:886
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:934
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
-#: src/client.cpp:965
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "Accesso all'account"
 
-#: src/client.cpp:998
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
-#: src/client.cpp:1098
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
-#: src/client.cpp:1129
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
-#: src/client.cpp:1139
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,63 +93,63 @@ msgstr "Cambiamento server del gioco"
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:1198
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
-#: src/client.cpp:1224
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Cambia password"
 
-#: src/client.cpp:1225
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: src/client.cpp:1244
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "Cambia Email"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
-#: src/client.cpp:1641
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1702
+#: src/client.cpp:1736
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:209
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:329
 msgid "Cannot send empty whispers!"
 msgstr "Impossibile inviare un sussurro vuoto!"
 
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:343
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -158,156 +158,160 @@ msgstr ""
 "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
 "sei tu."
 
-#: src/commandhandler.cpp:338
+#: src/commandhandler.cpp:363
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Richiesta per accedere al canale %s."
 
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:390
 msgid "Guild name is missing."
 msgstr "Manca il nome della gilda."
 
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
+#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
 msgid "Return toggles chat."
 msgstr "Attiva/disattiva la chat."
 
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:455
 msgid "Message closes chat."
 msgstr "I messaggi chiudono la conversazione."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:466
 msgid "Return now toggles chat."
 msgstr "Attiva/disattiva la chat adesso."
 
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:472
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la chat."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:500
 msgid "friend"
 msgstr "Amico"
 
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:505
 msgid "disregarded"
 msgstr "Disprezzato"
 
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:510
 msgid "neutral"
 msgstr "Neutrale"
 
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:529
 #, c-format
 msgid "Player already %s!"
 msgstr "Il giocatore è già %s!"
 
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:543
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Il giocatore è stato %s con successo!"
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:551
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Il giocatore non può essere %s!"
 
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:574
 msgid "Player wasn't ignored!"
 msgstr "Il giocatore non era ignorato!"
 
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:581
 msgid "Player no longer ignored!"
 msgstr "Giocatore non più ignorato!"
 
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:583
 msgid "Player could not be unignored!"
 msgstr "Impossibile annullare l'ignoro!"
 
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:589
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:594
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:609
 msgid "Player already erased!"
 msgstr "Il giocatore è già cancellato!"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:620
 msgid "Player successfully erased!"
 msgstr "Giocatore cancellato dal tuo schermo con successo!"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:622
 msgid "Player could not be erased!"
 msgstr "Il giocatore non può essere cancellato!"
 
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:939
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:956
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:964
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:972
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1051
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1063
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1067
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1069
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -326,35 +330,35 @@ msgstr "Generale"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Screenshot salvato come"
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
-#: src/game.cpp:572
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Errore di rete"
 
-#: src/game.cpp:1322
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: src/game.cpp:1732
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "Impossibile caricare la mappa."
 
-#: src/game.cpp:1733
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
@@ -388,19 +392,19 @@ msgid "Name"
 msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
+#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
 msgid "Attack"
 msgstr "Attacco"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Parla"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
+#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
+#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
 msgid "Move"
 msgstr "Movimento"
 
@@ -413,8 +417,8 @@ msgid "Reset"
 msgstr "Reimposta"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
+#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
 msgid "Buy"
 msgstr "Compra"
 
@@ -432,7 +436,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -440,7 +444,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -452,8 +456,8 @@ msgid "Quit"
 msgstr "Esci"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Massimo"
 
@@ -462,8 +466,8 @@ msgstr "Massimo"
 msgid "Shop"
 msgstr "Negozio"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
+#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -472,15 +476,15 @@ msgstr "Vendi"
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
+#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
+#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
+#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
+#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
 #: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -651,7 +655,7 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Elimina"
@@ -727,8 +731,9 @@ msgstr "Arcobaleno 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
@@ -738,12 +743,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:615
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1002
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -757,10 +762,12 @@ msgid "No"
 msgstr "No"
 
 #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
+#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
+#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
+#: src/gui/popupmenu.cpp:679
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -906,7 +913,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Chiudi"
 
@@ -933,8 +940,8 @@ msgstr "Equipaggiamento"
 
 #: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1874
 msgid "Unequip"
 msgstr "Togli"
 
@@ -976,31 +983,31 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
+#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
 msgid "Equip"
 msgstr "Equipaggia"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1880
 msgid "Use"
 msgstr "Usa"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
+#: src/gui/popupmenu.cpp:1885
 msgid "Drop..."
 msgstr "Lascia..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
+#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
 msgid "Split"
 msgstr "Dividi"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:559
 msgid "Outfits"
 msgstr "Attrezzatura"
 
@@ -1009,17 +1016,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
+#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Magazzino"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
+#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Lascia"
@@ -1259,7 +1266,7 @@ msgstr "Invia"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
 msgid "Clear"
 msgstr "Cancella"
 
@@ -1297,331 +1304,347 @@ msgstr "Rimuovi prima"
 msgid "Away outfit"
 msgstr "Away outfit"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Commercia"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
+#: src/gui/popupmenu.cpp:646
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
+#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
+#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
+#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
+#: src/gui/popupmenu.cpp:691
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:680
 msgid "Black list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
+#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:666
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
+#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
+#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
+#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:690
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
+#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:738
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
+#: src/gui/popupmenu.cpp:769
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:261
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
+#: src/gui/popupmenu.cpp:792
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
+#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:794
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
+#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:308
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:319
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:324
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:326
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:328
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:522
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:540
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:541
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
+#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:547
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:538
+#: src/gui/popupmenu.cpp:560
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Spells"
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:577
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:578
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:602
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:604
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:606
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:608
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:610
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:612
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:813
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1286
 msgid "Rename map sign          "
 msgstr "Rinomina mappa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1288
 msgid "Name:                    "
 msgstr "Nome:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1338
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1340
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1711
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1715
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1716
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1717
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
 msgid "Store 10"
 msgstr "Salva 10"
 
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1728
 msgid "Store half"
 msgstr "Salva metà"
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1729
 msgid "Store all"
 msgstr "Salva tutto"
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
+#: src/gui/popupmenu.cpp:1886
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1768
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1769
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1770
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
 msgid "Load old item shortcuts"
 msgstr "Carica vecchie scorciatoie oggetti"
 
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1902
 msgid "Load old drop shortcuts"
 msgstr "Carica vecchie scorciatoie drop"
 
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1975
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
 #: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
 msgid "Move down"
 msgstr ""
 
@@ -1936,29 +1959,33 @@ msgstr "Applica"
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibra"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Abilita joystick"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Ferma"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Ruota la manopola"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2030,11 +2057,11 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:81
 msgid "Draw path"
-msgstr ""
+msgstr "Traccia sentiero"
 
 #: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
-msgstr ""
+msgstr "Mostra hotkeys sulla mappa"
 
 #: src/gui/setup_other.cpp:87
 msgid "Enable lazy scrolling"
@@ -2062,7 +2089,7 @@ msgstr "Attacca in movimento"
 
 #: src/gui/setup_other.cpp:105
 msgid "Sync player move"
-msgstr ""
+msgstr "Sincronizza movimenti giocatore"
 
 #: src/gui/setup_other.cpp:108
 msgid "Crazy move A program"
@@ -2098,7 +2125,7 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:132
 msgid "Show job"
-msgstr ""
+msgstr "Mostra barra lavoro"
 
 #: src/gui/setup_other.cpp:135
 msgid "Enable attack filter"
@@ -2118,7 +2145,7 @@ msgstr "Abilita la modalità negozio"
 
 #: src/gui/setup_other.cpp:153
 msgid "Log NPC dialogue"
-msgstr ""
+msgstr "Log dialoghi NPC"
 
 #: src/gui/setup_other.cpp:157
 msgid "Bots support"
@@ -2141,24 +2168,24 @@ msgid "Enable bot checker"
 msgstr "Abilita il bot checker"
 
 #: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
-msgstr "Abilita protezione dai bug del server"
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
 msgstr "Abilita i log di debug"
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
 msgid "Low traffic mode"
-msgstr ""
+msgstr "Modalità basso traffico"
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
 msgid "Hide shield sprite"
-msgstr ""
+msgstr "Nascondi lo scudo"
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:187
 msgid "Show background"
-msgstr ""
+msgstr "Mostra sfondo"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
@@ -2170,7 +2197,7 @@ msgstr ""
 
 #: src/gui/setup_perfomance.cpp:61
 msgid "Hw acceleration"
-msgstr ""
+msgstr "Accellerazione hw"
 
 #: src/gui/setup_perfomance.cpp:64
 msgid "Enable opacity cache (Software, can use many memory)"
@@ -2214,15 +2241,15 @@ msgstr "Giocatori"
 
 #: src/gui/setup_players.cpp:54
 msgid "Show gender"
-msgstr ""
+msgstr "Mostra il sesso"
 
 #: src/gui/setup_players.cpp:57
 msgid "Show level"
-msgstr ""
+msgstr "Mostra il livello"
 
 #: src/gui/setup_players.cpp:60
 msgid "Show own name"
-msgstr ""
+msgstr "Mostra il proprio nome"
 
 #: src/gui/setup_players.cpp:63
 msgid "Enable extended mouse targeting"
@@ -2230,7 +2257,7 @@ msgstr ""
 
 #: src/gui/setup_players.cpp:66
 msgid "Target dead players"
-msgstr ""
+msgstr "Target sui personaggi morti"
 
 #: src/gui/setup_players.cpp:69
 msgid "Visible names"
@@ -2278,112 +2305,172 @@ msgstr "Ignorato"
 
 #: src/gui/setup_relations.cpp:74
 msgid "Erased"
-msgstr ""
+msgstr "Cancellato"
 
 #: src/gui/setup_relations.cpp:75
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:240
 msgid "Allow trading"
 msgstr "Permetti scambi"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:242
 msgid "Allow whispers"
 msgstr "Permetti sussurri"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Old"
-msgstr ""
+msgstr "Vecchio"
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:247
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Quando si ignora:"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
 msgid "Tiny (10)"
-msgstr ""
+msgstr "Minuscolo (10)"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
 msgid "Small (11)"
-msgstr ""
+msgstr "Piccolo (11)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
 msgid "Medium (12)"
-msgstr ""
+msgstr "Medio (12)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
 msgid "Large (13)"
-msgstr ""
+msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
 msgid "Big (14)"
-msgstr ""
+msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:113
 msgid "Huge (15)"
+msgstr "Enorme (15)"
+
+#: src/gui/setup_theme.cpp:146
+msgid "Chinese (China)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
-msgid "Theme"
+#: src/gui/setup_theme.cpp:147
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:148
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:149
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:150
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:151
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:152
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:153
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:154
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:155
+msgid "Portuguese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:156
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:157
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:158
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:190
+msgid "Theme"
+msgstr "Tema"
+
+#: src/gui/setup_theme.cpp:192
 msgid "Gui theme"
+msgstr "Tema Gui"
+
+#: src/gui/setup_theme.cpp:193
+msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:194
 msgid "Main Font"
-msgstr ""
+msgstr "Font principale"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:195
 msgid "Bold font"
-msgstr ""
+msgstr "Font in grassetto"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:196
 msgid "Particle font"
-msgstr ""
+msgstr "Font con particelle"
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:197
 msgid "Help font"
-msgstr ""
+msgstr "Help font"
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:198
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:199
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:236
 msgid "Font size"
 msgstr "Dimensione caratteri"
 
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:377
 msgid "Theme Changed"
-msgstr ""
+msgstr "Tema cambiato"
 
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
 #: src/gui/setup_video.cpp:194
 msgid "Software"
-msgstr ""
+msgstr "Software"
 
 #: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
-msgstr ""
+msgstr "OpenGL veloce"
 
 #: src/gui/setup_video.cpp:196
 msgid "Safe OpenGL"
-msgstr ""
+msgstr "OpenGL sicuro"
 
 #: src/gui/setup_video.cpp:223
 msgid "No text"
@@ -2435,7 +2522,7 @@ msgstr "Effetti particelle"
 
 #: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
-msgstr ""
+msgstr "Mostra notifica pickup"
 
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:295
@@ -2445,16 +2532,16 @@ msgstr "in chat"
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:297
 msgid "as particle"
-msgstr ""
+msgstr "come particelle"
 
 #: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr ""
+msgstr "Limite FPS:"
 
 #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
 #: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
 msgid "Alt FPS limit: "
-msgstr ""
+msgstr "Limite Alt FPS:  "
 
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
@@ -2470,27 +2557,31 @@ msgstr "Suoni ambientali"
 
 #: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr ""
+msgstr "Dettaglio particelle"
 
 #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
 #: src/gui/setup_video.cpp:708
 msgid "None"
-msgstr ""
+msgstr "Nessuno"
 
 #: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
+"Cambio verso la modalità finestra fallito e anche il ripristino modalità "
+"precedente è fallito!"
 
 #: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
+"Cambio verso la modalità schermo intero fallito e anche il ripristino della "
+"modalità precedente è fallito!"
 
 #: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
-msgstr ""
+msgstr "Cambiamento a schermo intero"
 
 #: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
@@ -2498,7 +2589,7 @@ msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
 #: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr ""
+msgstr "Cambiamento a OpenGL"
 
 #: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
@@ -2506,11 +2597,11 @@ msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
 #: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
-msgstr ""
+msgstr "Risoluzione scelta (esempio 1024x768)"
 
 #: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
-msgstr ""
+msgstr "Nuova risoluzione:                                         "
 
 #: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
@@ -2795,422 +2886,445 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:204
 msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:209
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:214
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:219
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:224
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:229
 msgid "(?) move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:247
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:251
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:261
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:266
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:271
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:276
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:281
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:286
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:291
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:296
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:294
+#: src/gui/statuspopup.cpp:301
 msgid "(?) move to target"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:302
+#: src/gui/statuspopup.cpp:309
 msgid "(D) default follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:306
+#: src/gui/statuspopup.cpp:313
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:310
+#: src/gui/statuspopup.cpp:317
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:314
+#: src/gui/statuspopup.cpp:321
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:318
+#: src/gui/statuspopup.cpp:325
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
+#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
 msgid "(D) default attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:339
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:337
+#: src/gui/statuspopup.cpp:344
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
+#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
 msgid "(?) attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:354
+#: src/gui/statuspopup.cpp:361
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:358
+#: src/gui/statuspopup.cpp:365
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:362
+#: src/gui/statuspopup.cpp:369
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:380
+#: src/gui/statuspopup.cpp:387
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:384
+#: src/gui/statuspopup.cpp:391
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:388
+#: src/gui/statuspopup.cpp:395
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:392
+#: src/gui/statuspopup.cpp:399
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:396
+#: src/gui/statuspopup.cpp:403
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:400
+#: src/gui/statuspopup.cpp:407
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:404
+#: src/gui/statuspopup.cpp:411
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:408
+#: src/gui/statuspopup.cpp:415
 msgid "(?) pick up"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:417
+#: src/gui/statuspopup.cpp:424
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:421
+#: src/gui/statuspopup.cpp:428
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:425
+#: src/gui/statuspopup.cpp:432
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:429
+#: src/gui/statuspopup.cpp:436
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:433
+#: src/gui/statuspopup.cpp:440
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:437
+#: src/gui/statuspopup.cpp:444
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:441
+#: src/gui/statuspopup.cpp:448
 msgid "(?) map view"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:456
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:461
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:466
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:471
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:469
+#: src/gui/statuspopup.cpp:476
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:473
+#: src/gui/statuspopup.cpp:480
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:482
+#: src/gui/statuspopup.cpp:489
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:501
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:514
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:486
+#: src/gui/statuspopup.cpp:518
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:490
+#: src/gui/statuspopup.cpp:522
 msgid "(?) imitation"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:499
+#: src/gui/statuspopup.cpp:531
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:502
+#: src/gui/statuspopup.cpp:534
 msgid "(A) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
+#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
 msgid "(?) away"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:513
+#: src/gui/statuspopup.cpp:545
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:517
+#: src/gui/statuspopup.cpp:549
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:521
+#: src/gui/statuspopup.cpp:553
 msgid "(D) design camera mode"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:564
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:537
+#: src/gui/statuspopup.cpp:569
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Soldi: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Esperienza:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Lavoro: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Lavoro:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:771
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:824
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr ""
 
@@ -3363,21 +3477,21 @@ msgstr "Connessione..."
 msgid "Play"
 msgstr "Gioca"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1 L'aggiornamento è stato completato."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Completato"
 
@@ -3941,7 +4055,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:371
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Scorciatoia %d"
@@ -4068,7 +4182,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:366
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
@@ -4197,119 +4311,123 @@ msgstr ""
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
-msgid "Change move type"
+#: src/keyboardconfig.cpp:329
+msgid "Switch pvp attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:330
-msgid "Change Attack Weapon Type"
+msgid "Change move type"
 msgstr ""
 
 #: src/keyboardconfig.cpp:332
-msgid "Change Attack Type"
+msgid "Change Attack Weapon Type"
 msgstr ""
 
 #: src/keyboardconfig.cpp:334
-msgid "Change Follow mode"
+msgid "Change Attack Type"
 msgstr ""
 
 #: src/keyboardconfig.cpp:336
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:338
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:341
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:350
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:429
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:381
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr ""
 
@@ -5099,53 +5217,53 @@ msgstr ""
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vuole commerciare con te, accetti?"
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "Scambio cancellato."
 
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "Scambio completato."
 
@@ -5564,15 +5682,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
@@ -5581,19 +5699,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "%s non è nel tuo party!"
 
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 49989d3c4..fbe04c585 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
@@ -11,80 +11,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
-"ja/)\n"
-"Language: ja\n"
+"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "サーバー通信中…"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "ログイン中…"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "ゲームの世界に入る中"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "服：％d"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "ゲームサーバー通信中…"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "サーバーを入り替え中…"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -94,50 +93,50 @@ msgstr "サーバーを入り替え中…"
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "登録細目を要請中"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "パスワード変更成功！"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "メール変更"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "メール変更成功！"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "登録解除成功"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "さよなら、いつでも戻ってね..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s は存在しないので作成することが不可能！終了中…"
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:  %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー： %s は存在しないので作成することが不可能！終了中…"
@@ -153,11 +152,9 @@ msgstr "空のメッセージを送信することはできません！"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分"
-"です。"
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
+msgstr "%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分です。"
 
 #: src/commandhandler.cpp:363
 #, c-format
@@ -314,9 +311,7 @@ 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:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -326,35 +321,35 @@ msgstr "一般"
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存することに失敗しました！"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "他人からのトレードリクエストを無視します。"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "他人からのトレードリクエストを受け入れます。"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "マップをロードできませんでした"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
@@ -432,7 +427,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -440,7 +435,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -452,8 +447,8 @@ msgid "Quit"
 msgstr "終了"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "最大"
 
@@ -727,10 +722,11 @@ msgstr "虹 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1368,7 +1364,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -1623,13 +1619,13 @@ msgstr "見せる"
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1785,9 +1781,7 @@ msgstr "お知らせ"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr ""
-"新しい音楽をダウンロードする場合は、クライアントを再起動する必要がある可能性"
-"がある"
+msgstr "新しい音楽をダウンロードする場合は、クライアントを再起動する必要がある可能性がある"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -1952,29 +1946,33 @@ msgstr "適用"
 msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "ボタンを押すと較正が始まります。"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "変化させる"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "ジョイスティックを使用可能にする"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "ジョイスティック"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "スティックを回転させる"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -3135,181 +3133,181 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "GP:%s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "経験値:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "ジョブポイント:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr "キャラクターポイント： %d"
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "レベル： %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr "修正点： %d"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3439,10 +3437,9 @@ msgid "You don't have enough money."
 msgstr "現金不足です。"
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重"
-"複して追加することは出来ません！"
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重複して追加することは出来ません！"
 
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
@@ -3461,21 +3458,21 @@ msgstr "接続しています..."
 msgid "Play"
 msgstr "プレイ"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1 とても推奨されます。"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "完了"
 
@@ -3711,15 +3708,11 @@ msgstr "このコマンドでは、入力したユーザーをチャンネルの
 #: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 #: src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で"
-"囲んでください。"
+msgstr "入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で囲んでください。"
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
-msgstr ""
-"チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出す"
-"ことができます。"
+msgstr "チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出すことができます。"
 
 #: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
@@ -3808,8 +3801,7 @@ msgstr "コマンド: /close"
 
 #: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
-msgstr ""
-"このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
+msgstr "このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
 
 #: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
@@ -3824,7 +3816,8 @@ 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
@@ -4352,67 +4345,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr "去って"
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "従う: "
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr "擬い: "
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr "あなた"
 
@@ -4778,8 +4771,7 @@ 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」を設定ください。"
+"＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にするために、「0」、「no」か「false」を設定ください。"
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4802,8 +4794,7 @@ 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」を設定ください。"
+"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にする場合、「0」、「no」か「false」を設定ください。"
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4998,9 +4989,7 @@ msgstr "ゲームを続けるためにはコインを入れてください。"
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
-msgstr ""
-"ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに"
-"向かっただけ。"
+msgstr "ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに向かっただけ。"
 
 #: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
 msgid ""
@@ -5059,9 +5048,7 @@ msgstr "命を失い、天国に向かった。"
 
 #: src/net/ea/playerhandler.cpp:126
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
-"もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃ"
-"ないか？"
+msgstr "もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃないか？"
 
 #: src/net/ea/playerhandler.cpp:127
 msgid "Your metabolic processes are now history."
@@ -5096,7 +5083,8 @@ msgstr "メッセージ"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "持っているアイテムは体重より半分以上なので、体力が回復できない。"
 
 #: src/net/ea/playerhandler.cpp:346
@@ -5671,15 +5659,15 @@ msgstr "攻撃距離"
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr "ホスト名を解決できません。"
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
@@ -5688,19 +5676,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "%sはパーティにはいない！"
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr "'...'を表示する"
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr "名前を瞬き"
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr "フローティング'...'バブル"
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr "フローティングバブル"
 
@@ -5732,3 +5720,5 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "不明なアイテム"
+
+
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 6610a9d22..ec8d2f6b2 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-11-04 02:32+0300\n"
+"POT-Creation-Date: 2011-11-12 00:23+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"
@@ -22,65 +22,65 @@ msgstr ""
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -90,50 +90,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -323,35 +323,35 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -429,7 +429,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr ""
 
@@ -437,7 +437,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr ""
 
@@ -449,8 +449,8 @@ msgid "Quit"
 msgstr ""
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr ""
 
@@ -724,10 +724,11 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr ""
 
@@ -1367,7 +1368,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr ""
 
@@ -1622,13 +1623,13 @@ msgstr ""
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr ""
 
@@ -1949,28 +1950,32 @@ msgstr ""
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -3132,181 +3137,181 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr ""
 
@@ -3456,21 +3461,21 @@ msgstr ""
 msgid "Play"
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr ""
 
@@ -4342,68 +4347,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr ""
 
@@ -5652,15 +5657,15 @@ msgstr ""
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
@@ -5669,19 +5674,19 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 909ea6e53..7dabe9900 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011.
 # Maarten Vanraes <maarten.vanraes@gmail.com>, 2011.
@@ -9,80 +9,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
-"manaplus/team/nl_BE/)\n"
-"Language: nl_BE\n"
+"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/manaplus/team/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -92,50 +91,50 @@ msgstr "Wijzigen spelservers"
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, 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."
@@ -151,8 +150,8 @@ msgstr "Kan geen lege berichten sturen!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
 "bestaat, of het is jezelf."
@@ -317,8 +316,7 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -328,35 +326,35 @@ msgstr "Algemeen"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -434,7 +432,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -442,7 +440,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -454,8 +452,8 @@ msgid "Quit"
 msgstr "Afsluiten"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Maximum"
 
@@ -729,10 +727,11 @@ msgstr "regenboog 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1372,7 +1371,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -1627,13 +1626,13 @@ msgstr "Toon"
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1956,29 +1955,33 @@ msgstr "Toepassen"
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Kalibreren"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Stoppen"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Maak rondjes met de stick"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2603,8 +2606,8 @@ msgstr "Scherm Resolutie is gewijzigd"
 #: src/gui/setup_video.cpp:621
 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"
+"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte"
+" resolutie"
 
 #: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
@@ -3145,181 +3148,181 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "Leven:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Ervaring:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "Magie:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3449,10 +3452,11 @@ msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
-"het venster."
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in"
+" het venster."
 
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
@@ -3471,21 +3475,21 @@ msgstr "Verbinden..."
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -3837,7 +3841,8 @@ msgid "Command: /unignore <player>"
 msgstr "Commando: /unignore <speler>"
 
 #: 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 ""
 "Dit commando stop met de andere speler te negeren als deze genegeerd werd."
 
@@ -4366,68 +4371,68 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr "U bent gedoodt door "
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "U raapte op %d [@@%d|%s@@]."
 msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr "Weg"
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "Volg: "
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr ""
 
@@ -4796,8 +4801,8 @@ msgid ""
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 "<beleid> kan een van de volgende zijn om voorwerpdeling in te schakelen: "
-"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", \"no"
-"\", \"false\"."
+"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", "
+"\"no\", \"false\"."
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -5120,7 +5125,8 @@ msgstr "Bericht"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
@@ -5505,7 +5511,8 @@ msgstr "Het nieuwe email adres bestaat reeds."
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
-"Client registratie is niet toegestaan. Contacteer aub de server adminstratie."
+"Client registratie is niet toegestaan. Contacteer aub de server "
+"adminstratie."
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
@@ -5699,15 +5706,15 @@ msgstr "Aanvalsbereik"
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr "Leeg adres gegeven aan Network::connect()!"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr "Niet mogelijk te resolven van host \""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr "Verbinding met server beëindigd. "
 
@@ -5716,19 +5723,19 @@ msgstr "Verbinding met server beëindigd. "
 msgid "%s is not in your party!"
 msgstr "%s is niet in jouw groep!"
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr "Say '...'"
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr "Blink naam"
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr "Zwevende '...' bel"
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr "Zwevende bel"
 
@@ -5760,3 +5767,5 @@ msgstr "Magie %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
+
+
diff --git a/po/pt.po b/po/pt.po
index 4bb12a7be..2f877ee1a 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.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <freya.df@gmail.com>, 2011.
@@ -10,80 +10,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
-"pt/)\n"
-"Language: pt\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:1171
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +92,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, 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."
@@ -152,11 +151,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"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:363
 #, c-format
@@ -318,8 +317,7 @@ 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:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -329,35 +327,35 @@ msgstr "Geral"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -435,7 +433,7 @@ msgstr "Quantidade:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -443,7 +441,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -455,8 +453,8 @@ msgid "Quit"
 msgstr "Sair"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Máximo"
 
@@ -730,10 +728,11 @@ msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1373,7 +1372,7 @@ msgstr "Não ignorar"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1628,13 +1627,13 @@ msgstr "Mostrar"
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1956,29 +1955,33 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Gire o bastão"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -3143,181 +3146,181 @@ msgstr "Modificadores de jogo desativados"
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(4)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3447,7 +3450,8 @@ msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3468,21 +3472,21 @@ msgstr "Conectando..."
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Concluído"
 
@@ -3827,7 +3831,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."
 
@@ -4358,68 +4363,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr "Você vê "
 
@@ -4808,7 +4813,8 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr ""
+"Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/ea/gui/partytab.cpp:110
 msgid ""
@@ -4825,7 +4831,8 @@ msgstr "Comando: /exp"
 #: src/net/ea/gui/partytab.cpp:114
 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."
+"Este comando exibe a atual opção de compartilhamento de experiência do "
+"grupo."
 
 #: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
@@ -5113,7 +5120,8 @@ msgstr "Mensagem"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
@@ -5694,15 +5702,15 @@ msgstr "Atraso de alcance"
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr "Endereço vazio enviado para Network::connect()!"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr "Não foi possível determinar o host \""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
@@ -5711,19 +5719,19 @@ msgstr "Conexão com o servidor interrompida. "
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr "Piscar nome"
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
@@ -5755,3 +5763,5 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Item desconhecido"
+
+
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 33f6db6cd..532d19385 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.
-#
+# 
 # Translators:
 #   <alasmirt@gmail.com>, 2011.
 # alastrim <alasmirt@gmail.com>, 2011.
@@ -12,80 +12,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
-"manaplus/team/pt_BR/)\n"
-"Language: pt_BR\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:1171
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "por nome"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "por id"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "por peso"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "por quantidade"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "por tipo"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Habilitar rolagem preguisoça "
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Rolagem preguiçosa"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +94,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, 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."
@@ -154,11 +153,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"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:363
 #, c-format
@@ -320,8 +319,7 @@ 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:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -331,35 +329,35 @@ msgstr "Geral"
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -437,7 +435,7 @@ msgstr "Quantidade:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -445,7 +443,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -457,8 +455,8 @@ msgid "Quit"
 msgstr "Sair"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Máximo"
 
@@ -732,10 +730,11 @@ msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1375,7 +1374,7 @@ msgstr "Não ignorar"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1630,13 +1629,13 @@ msgstr "Mostrar"
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1958,29 +1957,33 @@ msgstr "Aplicar"
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Gire o bastão"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -3145,181 +3148,181 @@ msgstr "Modificadores de jogo desativados"
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(l)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3449,7 +3452,8 @@ msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3470,21 +3474,21 @@ msgstr "Conectando..."
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Concluído"
 
@@ -3829,7 +3833,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."
 
@@ -4360,68 +4365,68 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr "Você vê "
 
@@ -4810,7 +4815,8 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr ""
+"Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/ea/gui/partytab.cpp:110
 msgid ""
@@ -4827,7 +4833,8 @@ msgstr "Comando: /exp"
 #: src/net/ea/gui/partytab.cpp:114
 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."
+"Este comando exibe a atual opção de compartilhamento de experiência do "
+"grupo."
 
 #: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
 msgid "Item sharing enabled."
@@ -5115,7 +5122,8 @@ msgstr "Mensagem"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
@@ -5696,15 +5704,15 @@ msgstr "Atraso de alcance"
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr "Endereço vazio enviado para Network::connect()!"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr "Não foi possível determinar o host \""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
@@ -5713,19 +5721,19 @@ msgstr "Conexão com o servidor interrompida. "
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr "Piscar nome"
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
@@ -5757,3 +5765,5 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Item desconhecido"
+
+
diff --git a/po/ru.po b/po/ru.po
index 6f52d89b5..cef414ee7 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.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
@@ -11,81 +11,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:41+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:42+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:1171
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Производительность"
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Видео"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr "Темы"
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +93,50 @@ msgstr "Смена игрового сервера"
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -154,11 +152,11 @@ msgstr "Нельзя отправлять пустые сообщения!"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
-"уже создана, или этот игрок Вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
+" уже создана, или этот игрок Вы сами."
 
 #: src/commandhandler.cpp:363
 #, c-format
@@ -325,9 +323,7 @@ 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:252 src/gui/widgets/chattab.cpp:403
 msgid "General"
@@ -337,35 +333,35 @@ msgstr "Общие"
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -443,7 +439,7 @@ msgstr "Количество:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -451,7 +447,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -463,8 +459,8 @@ msgid "Quit"
 msgstr "Выход"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "Макс"
 
@@ -738,10 +734,11 @@ msgstr "радуга 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
@@ -1383,7 +1380,7 @@ msgstr "Не игнорировать"
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "@@ignore|Полностью игнорировать@@"
 
@@ -1638,13 +1635,13 @@ msgstr "Показать"
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1966,29 +1963,33 @@ msgstr "Применить"
 msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "Калибровать"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "Использовать джойстик"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr "Использовать джойстик если игра свернута"
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "Джойстик"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Вращайте рукоять"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr "Вращайте стик и не нажимайте другие кнопки"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2192,7 +2193,8 @@ msgstr "Показать фон"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
-msgstr "Улучшение производительности (включите для большей производительности)"
+msgstr ""
+"Улучшение производительности (включите для большей производительности)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
@@ -2577,8 +2579,8 @@ msgstr "Нет"
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
-"удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
+" удалось!"
 
 #: src/gui/setup_video.cpp:490
 msgid ""
@@ -3160,181 +3162,181 @@ msgstr "Игровые модификаторы выключены"
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "Деньги: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "ОЖ:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "Мана:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "Профессия: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "Профессия:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr "Очки персонажа: %d"
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Уровень: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr "Очков навыков: %d"
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3464,7 +3466,8 @@ msgid "You don't have enough money."
 msgstr "У вас недостаточно денег"
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
@@ -3486,21 +3489,21 @@ msgstr "Соединение..."
 msgid "Play"
 msgstr "Играть"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен!"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "Завершено"
 
@@ -3839,15 +3842,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
@@ -4377,41 +4381,41 @@ msgstr ""
 "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
 "вести."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr "Вы были убиты "
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4419,27 +4423,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr "Вы видите "
 
@@ -4587,7 +4591,8 @@ msgstr "Неизвестная ошибка сервера персонажей.
 
 #: src/net/ea/charserverhandler.cpp:138
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+msgstr ""
+"Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
 #: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
 msgid "Wrong name."
@@ -4808,8 +4813,8 @@ 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\" -- для выключения."
+"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения или"
+" \"0\", \"no\", \"false\" -- для выключения."
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4817,7 +4822,8 @@ msgstr "Команда: /item"
 
 #: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
-msgstr "Отображает текущую политику разделения предметов между членами группы."
+msgstr ""
+"Отображает текущую политику разделения предметов между членами группы."
 
 #: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
@@ -5125,7 +5131,8 @@ msgstr "Сообщение"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье "
 "восстанавливаться не будет."
@@ -5710,15 +5717,15 @@ msgstr "Зона атаки"
 msgid "Damage per sec."
 msgstr "Урон в сек."
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr "Пустой адрес был передан методу Network::connect()!"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr "Не удалось найти хост \""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr "Подключение к серверу прервано."
 
@@ -5727,19 +5734,19 @@ msgstr "Подключение к серверу прервано."
 msgid "%s is not in your party!"
 msgstr "%s не в группе!"
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr "Печатать '...'"
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr "Мигать именем"
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr "Плавающий '...' пузырек"
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr "Плавающий пузырек"
 
@@ -5771,3 +5778,5 @@ msgstr "Мана %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
+
+
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 911b057cc..f80a91390 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <colorfullife81@gmail.com>, 2011.
@@ -10,80 +10,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-04 02:32+0300\n"
-"PO-Revision-Date: 2011-11-03 23:34+0000\n"
+"POT-Creation-Date: 2011-11-12 00:23+0300\n"
+"PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
-"team/zh_CN/)\n"
-"Language: zh_CN\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: src/actorspritemanager.cpp:1171
 msgid "Visible on map"
 msgstr "在地图上可见"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:548
+#: src/being.cpp:551
 msgid "miss"
 msgstr "无法出售无法出售的物品。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1530
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1535
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:856 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "魔法攻击"
 
-#: src/client.cpp:863 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:868 src/gui/setup_video.cpp:315
+#: src/client.cpp:881 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:873
+#: src/client.cpp:886
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:955
+#: src/client.cpp:968
 msgid "Connecting to server"
 msgstr "魔法防御"
 
-#: src/client.cpp:986
+#: src/client.cpp:999
 msgid "Logging in"
 msgstr "尝试捡起不存在的物品。"
 
-#: src/client.cpp:1019
+#: src/client.cpp:1032
 msgid "Entering game world"
 msgstr "捡起物品发生不存在的物品。"
 
-#: src/client.cpp:1119
+#: src/client.cpp:1132
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1163
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1160
+#: src/client.cpp:1173
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1203 src/client.cpp:1210 src/client.cpp:1344
+#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +92,50 @@ msgstr "更改游戏服务器"
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1219
+#: src/client.cpp:1232
 msgid "Requesting registration details"
 msgstr "请求注册的详细信息"
 
-#: src/client.cpp:1245
+#: src/client.cpp:1258
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1246
+#: src/client.cpp:1259
 msgid "Password changed successfully!"
 msgstr "更改密码成功！"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Email Change"
 msgstr "更改电子邮件"
 
-#: src/client.cpp:1266
+#: src/client.cpp:1279
 msgid "Email changed successfully!"
 msgstr "更改电子邮件成功！"
 
-#: src/client.cpp:1286
+#: src/client.cpp:1299
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1287
+#: src/client.cpp:1300
 msgid "Farewell, come back any time..."
 msgstr "再见，随时欢迎回来... ..."
 
-#: src/client.cpp:1486 src/client.cpp:1516 src/client.cpp:1531
-#: src/client.cpp:1956 src/client.cpp:1963
+#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
+#: src/client.cpp:1969 src/client.cpp:1976
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，并且无法创建！退出。"
 
-#: src/client.cpp:1662
+#: src/client.cpp:1675
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机: %s"
 
-#: src/client.cpp:1696 src/client.cpp:1702
+#: src/client.cpp:1709 src/client.cpp:1715
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1723
+#: src/client.cpp:1736
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在并且无法创建！退出。"
@@ -152,8 +151,8 @@ msgstr "无法发送空白密语！"
 #: src/commandhandler.cpp:343
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
 #: src/commandhandler.cpp:363
@@ -321,35 +320,35 @@ msgstr "常规"
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:513
+#: src/game.cpp:506
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:521
+#: src/game.cpp:514
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:560
+#: src/game.cpp:554
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:577
+#: src/game.cpp:557
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1335
+#: src/game.cpp:1332
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1345
+#: src/game.cpp:1342
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1745
+#: src/game.cpp:1750
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1746
+#: src/game.cpp:1751
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -427,7 +426,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
 #: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:996
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
 msgid "+"
 msgstr "+"
 
@@ -435,7 +434,7 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
 #: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1008
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
 msgid "-"
 msgstr "-"
 
@@ -447,8 +446,8 @@ msgid "Quit"
 msgstr "退出"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:995 src/gui/statuswindow.cpp:1026
+#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
+#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
 msgid "Max"
 msgstr "最大"
 
@@ -722,10 +721,11 @@ msgstr "彩虹3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:222 src/gui/setup_theme.cpp:74
-#: src/gui/setup_theme.cpp:128 src/gui/setup_theme.cpp:173
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "？？？"
 
@@ -1363,7 +1363,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
 #: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
 #: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:439
+#: src/playerrelations.cpp:446
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -1618,13 +1618,13 @@ msgstr "显示"
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:145
-#: src/gui/socialwindow.cpp:958 src/gui/socialwindow.cpp:993
-#: src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1945,29 +1945,33 @@ msgstr "应用"
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
 msgstr "校准"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
 msgstr "启用游戏杆"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:75
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
 msgstr "游戏杆"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:147
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "旋转手柄"
+#: src/gui/setup_joystick.cpp:149
+msgid "Rotate the stick and dont press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -3128,181 +3132,181 @@ msgstr ""
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
+#: src/gui/statuswindow.cpp:337
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
+#: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:151
 msgid "HP:"
 msgstr "HP："
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:158
 msgid "Exp:"
 msgstr "经验："
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:172
 msgid "MP:"
 msgstr "MP："
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:205
 msgid "Job:"
 msgstr "职业："
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
 msgstr "角色可用点: %d"
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:817 src/gui/statuswindow.cpp:846
-#: src/gui/statuswindow.cpp:869 src/gui/statuswindow.cpp:888
+#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
+#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
 msgid "(D)"
 msgstr "(D)"
 
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
 msgid "(I)"
 msgstr "(I)"
 
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
+#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
 msgid "(c)"
 msgstr "(c)"
 
-#: src/gui/statuswindow.cpp:657
+#: src/gui/statuswindow.cpp:658
 msgid "(C)"
 msgstr "(C)"
 
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
+#: src/gui/statuswindow.cpp:803
 msgid "(d)"
 msgstr "(d)"
 
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-#: src/gui/statuswindow.cpp:875 src/gui/statuswindow.cpp:891
-#: src/gui/statuswindow.cpp:904
+#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
+#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
+#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
+#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
+#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
+#: src/gui/statuswindow.cpp:905
 msgid "(?)"
 msgstr "(?)"
 
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-#: src/gui/statuswindow.cpp:793
+#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:794
 msgid "(a)"
 msgstr "(a)"
 
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:686
 msgid "(0)"
 msgstr "(0)"
 
-#: src/gui/statuswindow.cpp:688
+#: src/gui/statuswindow.cpp:689
 msgid "(1)"
 msgstr "(1)"
 
-#: src/gui/statuswindow.cpp:691
+#: src/gui/statuswindow.cpp:692
 msgid "(2)"
 msgstr "(2)"
 
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
 msgid "(3)"
 msgstr "(3)"
 
-#: src/gui/statuswindow.cpp:697
+#: src/gui/statuswindow.cpp:698
 msgid "(5)"
 msgstr "(5)"
 
-#: src/gui/statuswindow.cpp:700
+#: src/gui/statuswindow.cpp:701
 msgid "(7)"
 msgstr "(7)"
 
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:901
+#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
 msgid "(A)"
 msgstr "(A)"
 
-#: src/gui/statuswindow.cpp:719
+#: src/gui/statuswindow.cpp:720
 msgid "(R)"
 msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:722
+#: src/gui/statuswindow.cpp:723
 msgid "(M)"
 msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:725
+#: src/gui/statuswindow.cpp:726
 msgid "(P)"
 msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:739
+#: src/gui/statuswindow.cpp:740
 msgid "(s)"
 msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:814
+#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
 msgid "(S)"
 msgstr "(S)"
 
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:829
-#: src/gui/statuswindow.cpp:882
+#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
+#: src/gui/statuswindow.cpp:883
 msgid "(G)"
 msgstr "(G)"
 
-#: src/gui/statuswindow.cpp:771 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
 msgid "(f)"
 msgstr "(f)"
 
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:820
-#: src/gui/statuswindow.cpp:885
+#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:886
 msgid "(F)"
 msgstr "(F)"
 
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
 msgid "(U)"
 msgstr "(U)"
 
-#: src/gui/statuswindow.cpp:799 src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
 msgid "(b)"
 msgstr "(b)"
 
-#: src/gui/statuswindow.cpp:826
+#: src/gui/statuswindow.cpp:827
 msgid "(g)"
 msgstr "(g)"
 
-#: src/gui/statuswindow.cpp:843
+#: src/gui/statuswindow.cpp:844
 msgid "(N)"
 msgstr "(N)"
 
-#: src/gui/statuswindow.cpp:849
+#: src/gui/statuswindow.cpp:850
 msgid "(u)"
 msgstr "(u)"
 
-#: src/gui/statuswindow.cpp:855
+#: src/gui/statuswindow.cpp:856
 msgid "(e)"
 msgstr "(e)"
 
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:898
+#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
 msgid "(O)"
 msgstr "(O)"
 
@@ -3432,7 +3436,8 @@ msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3452,21 +3457,21 @@ msgstr "连接中..."
 msgid "Play"
 msgstr "开始"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:565
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:567
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:569
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:745
 msgid "Completed"
 msgstr "已完成"
 
@@ -3810,7 +3815,8 @@ 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
@@ -4338,67 +4344,67 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:389
 msgid "You were killed by "
 msgstr "你被打死"
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1442
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1474
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:3200
+#: src/localplayer.cpp:3206
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:3535
+#: src/localplayer.cpp:3541
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3537 src/localplayer.cpp:3552
+#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3544
+#: src/localplayer.cpp:3550
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3546 src/localplayer.cpp:3554
+#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3902
+#: src/localplayer.cpp:3908
 msgid "You see "
 msgstr "你看"
 
@@ -4763,9 +4769,7 @@ 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\"用来禁止物品共享。"
+msgstr "<策略>可以为“1”，“yes”，“true”其中一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4787,9 +4791,7 @@ msgstr "该命令改变帮会的经验共享策略。"
 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\"用来关闭经验共享。"
+msgstr "<策略>可以为“1”，“yes”，“true”其中之一以开启经验共享，或者 是\"0\",\"no\",\"false\"用来关闭经验共享。"
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -5069,9 +5071,7 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:133
 msgid "You're pining for the fjords."
-msgstr ""
-"<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\","
-"\"false\"用来禁止物品共享。"
+msgstr "<策略>可以为“1”，“yes”，“true”其中之一以开启物品共享，或者 是\"0\",\"no\",\"false\"用来禁止物品共享。"
 
 #: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
 #: src/net/ea/playerhandler.cpp:427
@@ -5080,7 +5080,8 @@ msgstr "讯息"
 
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）"
 
 #: src/net/ea/playerhandler.cpp:346
@@ -5655,15 +5656,15 @@ msgstr "攻击范围"
 msgid "Damage per sec."
 msgstr "每秒伤害"
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr "空的地址给网络：连接（）！"
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr "无法解析主机“"
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr "连接到服务器终止。"
 
@@ -5672,19 +5673,19 @@ msgstr "连接到服务器终止。"
 msgid "%s is not in your party!"
 msgstr "%s不在你的帮会中！"
 
-#: src/playerrelations.cpp:453
+#: src/playerrelations.cpp:460
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:473
+#: src/playerrelations.cpp:480
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:517
+#: src/playerrelations.cpp:524
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:520
+#: src/playerrelations.cpp:527
 msgid "Floating bubble"
 msgstr "流动的泡沫"
 
@@ -5716,3 +5717,5 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "未知物品"
+
+
author	Andrei Karas <akaras@inbox.ru>	2011-11-12 00:56:25 +0300
committer	Andrei Karas <akaras@inbox.ru>	2011-11-12 00:56:25 +0300
commit	1c1232094c3f54b0a7b109b23e0754095ed29cd7 (patch)
tree	e7a025559262a13a7d178b25f89fd51dc2642a26
parent	ab165386008a2b19e997d91fffe634d3145d27b8 (diff)
download	manaverse-1c1232094c3f54b0a7b109b23e0754095ed29cd7.tar.gz manaverse-1c1232094c3f54b0a7b109b23e0754095ed29cd7.tar.bz2 manaverse-1c1232094c3f54b0a7b109b23e0754095ed29cd7.tar.xz manaverse-1c1232094c3f54b0a7b109b23e0754095ed29cd7.zip