Update translations.

22 files changed, 1907 insertions, 2250 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f3d9f5778..7d33db6ba 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -74,7 +74,6 @@ src/gui/widgets/tabs/socialplayerstab.h
 src/gui/widgets/tabs/socialtabbase.h
 src/gui/windowmenu.cpp
 src/gui/windows/bankwindow.cpp
-src/gui/windows/botcheckerwindow.cpp
 src/gui/windows/buydialog.cpp
 src/gui/windows/buyselldialog.cpp
 src/gui/windows/changeemaildialog.cpp
diff --git a/po/ca.po b/po/ca.po
index 0188441b4..1dd6480da 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-25 11:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/"
@@ -308,12 +308,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Acceptant sol·licituds d'intercanvi"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Visible al mapa"
 
@@ -486,7 +486,7 @@ msgstr "Bombolla flotant"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configuració"
@@ -674,36 +674,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Error al guardar la captura de pantalla!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "S'ha perdut la connexió amb el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Error de xarxa"
 
@@ -1632,13 +1632,12 @@ msgstr "Intercanvi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Atacar"
 
@@ -1695,20 +1694,18 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Moure"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Parlar"
 
@@ -1910,7 +1907,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Conjunt"
@@ -1923,7 +1920,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Conjurs"
 
@@ -2328,7 +2325,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Deixar caure"
@@ -2393,7 +2390,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Dreceres"
 
@@ -2402,7 +2399,7 @@ msgstr "Dreceres"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2418,7 +2415,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Xat"
 
@@ -3520,7 +3517,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr ""
 
@@ -3993,7 +3990,7 @@ msgstr "Encercla objectiu del monstre"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4166,7 +4163,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4543,9 +4540,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Nom"
 
@@ -5182,163 +5177,154 @@ msgstr ""
 msgid "Quests"
 msgstr ""
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "BC"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Comprovador de Bot"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Estadística de morts"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "EST"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Estat"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Equipament"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventari"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Motxilla"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Habilitats"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "CON"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "A"
@@ -5346,29 +5332,29 @@ msgstr "A"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5389,22 +5375,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Comprovador de bots"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Reajustar"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Resultat"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6272,6 +6242,11 @@ msgstr "Següent"
 msgid "Submit"
 msgstr "Envia"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Reajustar"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7934,82 +7909,77 @@ msgstr "Finestra d'ordres"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Finestra de comprobació de bots"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Finestra de gent en línia"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Finestra de abocament ràpid"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Finestra social anterior"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Finestra social següent"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9706,5 +9676,20 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Amaga sprite de protector"
 
+#~ msgid "BC"
+#~ msgstr "BC"
+
+#~ msgid "Bot checker"
+#~ msgstr "Comprovador de Bot"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Comprovador de bots"
+
+#~ msgid "Result"
+#~ msgstr "Resultat"
+
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Error al enviar o carta invàlida."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Finestra de comprobació de bots"
diff --git a/po/cs.po b/po/cs.po
index 2c3950304..4d5024a27 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
@@ -312,12 +312,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
@@ -491,7 +491,7 @@ msgstr "Plovoucí bublina"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Nastavení"
@@ -679,36 +679,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Obecný"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Snímek obrazovky uložen jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Chyba sítě"
 
@@ -1638,13 +1638,12 @@ msgstr "Obchod"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Útok"
 
@@ -1701,20 +1700,18 @@ msgstr "Vyhladit"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Jdi sem"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Promluv"
 
@@ -1916,7 +1913,7 @@ msgstr "Přesunout kameru"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Výstroje"
@@ -1929,7 +1926,7 @@ msgstr "Vyčistit výstroj"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Kouzla"
 
@@ -2335,7 +2332,7 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Upustit"
@@ -2400,7 +2397,7 @@ msgstr "Zkladní"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Zkratky"
 
@@ -2409,7 +2406,7 @@ msgstr "Zkratky"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Okna"
 
@@ -2425,7 +2422,7 @@ msgstr "Smajlíci"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Chat"
 
@@ -3527,7 +3524,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Záložky"
 
@@ -4000,7 +3997,7 @@ msgstr "Cyklovat zaměřená monstra"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4173,7 +4170,7 @@ msgstr "Povolit upozornění na váhu"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4557,9 +4554,7 @@ msgstr ""
 "dotyková rozhraní)"
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Jméno"
 
@@ -5194,163 +5189,154 @@ msgstr "ÚK"
 msgid "Quests"
 msgstr "Úkoly"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "OB"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Ověřovač botů"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "SZ"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Statistiky zabíjení"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Smajlíci"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Stav"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "VYB"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Vybavení"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventář"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Košík"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "DOV"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Dovednosti"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Společenství"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "ZK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "KO"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "UP"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "VŽ"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Víte že"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "OBCH"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "VÝ"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr "AK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr "Aktualizace"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr "BA"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banka"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "MAP"
@@ -5358,29 +5344,29 @@ msgstr "MAP"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr "OKN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "NAS"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5401,22 +5387,6 @@ msgstr "Vybrat"
 msgid "Deposit"
 msgstr "Vložit"
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Ověřovač botů"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Resetovat"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Výsledek"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6296,6 +6266,11 @@ msgstr "Další"
 msgid "Submit"
 msgstr "Odeslat"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Resetovat"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7958,82 +7933,77 @@ msgstr "Okno příkazů"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Okno kontroly botů"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Okno \"Kdo je online\""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Okno \"Víte že...\""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Okno úkolů"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr "Okno Aktualizací"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Okno úkolů"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Předchozí záložka společenství"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Další záložka společenství"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr "Předchozí záložka zkratek"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr "Další záložka zkratek"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr "Předchozí záložka příkazů"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr "Další záložka příkazů"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr "Předchozí záložka inventáře"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr "Další záložka inventáře"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9737,6 +9707,18 @@ msgstr "Volby k %s jsou \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 #~ msgid "Hide shield sprite"
 #~ msgstr "Skrýt zobrazení štítu"
 
+#~ msgid "BC"
+#~ msgstr "OB"
+
+#~ msgid "Bot checker"
+#~ msgstr "Ověřovač botů"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Ověřovač botů"
+
+#~ msgid "Result"
+#~ msgstr "Výsledek"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Čas do zrození Jack O:"
 
@@ -9748,3 +9730,6 @@ msgstr "Volby k %s jsou \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Odeslání se nezdařilo. Odesílatel nebo dopis není platný."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Okno kontroly botů"
diff --git a/po/de.po b/po/de.po
index f4951d0cf..e2ad2a29c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -33,9 +33,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
-"PO-Revision-Date: 2015-04-22 16:59+0000\n"
-"Last-Translator: jmf <jm.franz@online.de>\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
+"PO-Revision-Date: 2015-05-06 22:38+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
 "de/)\n"
 "Language: de\n"
@@ -333,12 +333,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Eingehende Handelsanfragen akzeptieren"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Auf der Karte sichtbar"
 
@@ -511,7 +511,7 @@ msgstr "Schwebende Blase"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Einstellungen"
@@ -699,36 +699,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Screenshot gespeichert unter %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Screenshot konnte nicht gespeichert werden!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
@@ -1661,13 +1661,12 @@ msgstr "Handeln"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Angriff"
 
@@ -1724,20 +1723,18 @@ msgstr "Atombombe"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Sprechen"
 
@@ -1939,7 +1936,7 @@ msgstr "Kamera bewegen"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Ausrüstungset"
@@ -1952,7 +1949,7 @@ msgstr "Ausrüstungset leeren"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Zaubersprüche"
 
@@ -2358,7 +2355,7 @@ msgstr "Alles wegwerfen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -2423,7 +2420,7 @@ msgstr "Normal"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Kurzbefehle"
 
@@ -2432,7 +2429,7 @@ msgstr "Kurzbefehle"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Fenster"
 
@@ -2448,7 +2445,7 @@ msgstr "Gefühle"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Chat"
 
@@ -3550,7 +3547,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Reiter"
 
@@ -4023,7 +4020,7 @@ msgstr "Zwischen anvisierten Monstern wechseln"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4196,7 +4193,7 @@ msgstr "Benachrichtigungen über Gewicht aktivieren"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4582,9 +4579,7 @@ msgid ""
 msgstr "Rechtsklick bei langem Klick emulieren (nützlich für Touchpads)"
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Name"
 
@@ -5224,163 +5219,154 @@ msgstr "QE"
 msgid "Quests"
 msgstr "Quests"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "BP"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Botprüfung"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "TS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Tötungsstatistik"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Similies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "AUS"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Ausrüstung"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventar"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr "EK"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Einkaufswagen"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "KAR"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "FÄH"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Fähigkeiten"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOZ"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Sozial"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "KB"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "ZS"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "WW"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "WDS"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Wusstest du schon?"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "STD"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "RS"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr "UP"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr "Updates"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr "BA"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Bank"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "KAR"
@@ -5388,29 +5374,29 @@ msgstr "KAR"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr "FL"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "EINST"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5431,22 +5417,6 @@ msgstr "Abheben"
 msgid "Deposit"
 msgstr "Einzahlen"
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Botprüfung"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Zurücksetzten"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Resultat"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6324,6 +6294,11 @@ msgstr "Weiter"
 msgid "Submit"
 msgstr "Absenden"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Zurücksetzten"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7986,82 +7961,77 @@ msgstr "Fenster: Befehle"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Fenster: Botprüfung"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Fenster: Wer ist online?"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Fenster: Wusstest du schon?"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Fenster: Aufträge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr "Fenster: Updates"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr "Fenster: Warenkorb"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Fenster: Aufträge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Vorheriger Sozialreiter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Nächster Sozialreiter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr "Vorheriger Kurzbefehlreiter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr "Nächster Kurzbefehlreiter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr "Vorheriger Befehlsreiter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr "Nächster Befehlsreiter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr "Vorheriger Inventarreiter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr "Nächster Inventarreiter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr "Fenster: Wegwerfen leeren"
 
@@ -9788,6 +9758,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Schildsprite verstecken"
 
+#~ msgid "BC"
+#~ msgstr "BP"
+
+#~ msgid "Bot checker"
+#~ msgstr "Botprüfung"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Botprüfung"
+
+#~ msgid "Result"
+#~ msgstr "Resultat"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Zeit bis zum Erscheinen von jacko:"
 
@@ -9799,3 +9781,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Als Sender senden fehlgeschlagen oder Brief ist ungültig."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Fenster: Botprüfung"
diff --git a/po/es.po b/po/es.po
index a8a9af62b..325d632d4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-25 22:40+0000\n"
 "Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
@@ -320,12 +320,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Visibles en el mapa"
 
@@ -498,7 +498,7 @@ msgstr "Burbuja flotante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configuración"
@@ -686,36 +686,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de pantalla guardada como %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Error de Red"
 
@@ -1647,13 +1647,12 @@ msgstr "Intercambio"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Atacar"
 
@@ -1710,20 +1709,18 @@ msgstr "Eliminar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Mover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Hablar"
 
@@ -1925,7 +1922,7 @@ msgstr "Mover cámara"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Vestimenta"
@@ -1938,7 +1935,7 @@ msgstr "Limpiar vestimenta"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Hechizos"
 
@@ -2344,7 +2341,7 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Tirar"
@@ -2409,7 +2406,7 @@ msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Atajos"
 
@@ -2418,7 +2415,7 @@ msgstr "Atajos"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Ventanas"
 
@@ -2434,7 +2431,7 @@ msgstr "Emotes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Chat"
 
@@ -3537,7 +3534,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Pestañas"
 
@@ -4010,7 +4007,7 @@ msgstr "Apuntar cíclicamente a los monstruos, no necesariamente al más cercano
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4183,7 +4180,7 @@ msgstr "Habilitar notificaciones de peso"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4567,9 +4564,7 @@ msgstr ""
 "interfaces táctiles)"
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Nombre"
 
@@ -5206,163 +5201,154 @@ msgstr "QE"
 msgid "Quests"
 msgstr "Misiones"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "BC"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Inspector de bot"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Estadísticas"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Emotíconos"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Estado"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Equipamiento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventario"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr "CA"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Mochila"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "¿Sabías que..."
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr "UP"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr "Actualizaciones"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr "BA"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banco"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "MAP"
@@ -5370,29 +5356,29 @@ msgstr "MAP"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5413,22 +5399,6 @@ msgstr "Retirar"
 msgid "Deposit"
 msgstr "Depositar"
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Inspector de Bot"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Restablecer"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Resultado"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6311,6 +6281,11 @@ msgstr "Siguiente"
 msgid "Submit"
 msgstr "Enviar"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Restablecer"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7975,82 +7950,77 @@ msgstr "Ventana de Comandos"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Ventana del Inspector de Bot"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Ventana de Jugadores Conectados"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Ventana ¿Sabías que.."
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Ventana de Misiones"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr "Ventana de Actualizaciones"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr "Ventana del Carrito"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Ventana de Misiones"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Pestaña Social Previa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Pestaña Social Siguiente"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr "Pestaña de Atajos Previa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr "Pestaña de Atajos Siguiente"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr "Pestaña de Comandos Previa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr "Pestaña de Comandos Siguiente"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr "Pestaña previa del inventario"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr "Pestaña siguiente del inventario"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr "Limpiar ventana de drops"
 
@@ -9771,6 +9741,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Ocultar sprite protector"
 
+#~ msgid "BC"
+#~ msgstr "BC"
+
+#~ msgid "Bot checker"
+#~ msgstr "Inspector de bot"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Inspector de Bot"
+
+#~ msgid "Result"
+#~ msgstr "Resultado"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Tiempo antes de que jacko aparezca:"
 
@@ -9782,3 +9764,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Fallo al enviar o mensaje inválido."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Ventana del Inspector de Bot"
diff --git a/po/fi.po b/po/fi.po
index 3cf7b54d3..e00bc7bf3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
@@ -307,12 +307,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
@@ -485,7 +485,7 @@ msgstr "Leijuva puhekupla"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Asetukset"
@@ -673,36 +673,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Yleiset"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
@@ -1631,13 +1631,12 @@ msgstr "Tee kaupat"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Hyökkää"
 
@@ -1694,20 +1693,18 @@ msgstr "Pommita"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Liiku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Keskustele"
 
@@ -1909,7 +1906,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
@@ -1922,7 +1919,7 @@ msgstr "Poista asu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Loitsut"
 
@@ -2328,7 +2325,7 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Pudota"
@@ -2393,7 +2390,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
@@ -2402,7 +2399,7 @@ msgstr "Pikavalinnat"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2418,7 +2415,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Keskustelu"
 
@@ -3520,7 +3517,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Välilehdet"
 
@@ -3993,7 +3990,7 @@ msgstr "Vaihda hirviökohteita syklissä"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4166,7 +4163,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4543,9 +4540,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Nimi"
 
@@ -5178,163 +5173,154 @@ msgstr ""
 msgid "Quests"
 msgstr ""
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "BT"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Bottitutka"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "TT"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Tappotilastot"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Hymiöt"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "Tie"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Hahmon tiedot"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "Var"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Varusteet"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "Tav"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Tavarat"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Kärry"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "Tai"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Taidot"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "Sos"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Suhteet"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "PV"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "Lo"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "Pu"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "T?"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Tiesitkö"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "P"
@@ -5342,29 +5328,29 @@ msgstr "P"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "Ase"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5385,22 +5371,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Bottitutka"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Nollaa"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Tulos"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6271,6 +6241,11 @@ msgstr "Seuraava"
 msgid "Submit"
 msgstr "Lähetä"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Nollaa"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7931,82 +7906,77 @@ msgstr "Komentoikkuna"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Bottitutkaikkuna"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Kuka on linjoilla -ikkuna"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Tiesitkö-ikkuna"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Pikapudotusikkuna"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Edellinen sos. välilehti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Seuraava sos. välilehti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9712,6 +9682,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Piilota kilpihahmo"
 
+#~ msgid "BC"
+#~ msgstr "BT"
+
+#~ msgid "Bot checker"
+#~ msgstr "Bottitutka"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Bottitutka"
+
+#~ msgid "Result"
+#~ msgstr "Tulos"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Aika jackon resetiin:"
 
@@ -9723,3 +9705,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Bottitutkaikkuna"
diff --git a/po/fr.po b/po/fr.po
index 103af61aa..0dd153da7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-26 23:49+0000\n"
 "Last-Translator: Alige <aligetmw@hotmail.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
@@ -322,12 +322,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
@@ -500,7 +500,7 @@ msgstr "Bulle flottante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configuration"
@@ -689,37 +689,37 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Général"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Débogage"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Capture d'écran sauvegardée sous %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "La  capture d'écran a échoué !"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
@@ -1652,13 +1652,12 @@ msgstr "Échange"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Attaquer"
 
@@ -1715,20 +1714,18 @@ msgstr "Annihiler"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Déplacement"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Parler"
 
@@ -1930,7 +1927,7 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Costumes"
@@ -1943,7 +1940,7 @@ msgstr "Effacer la tenue"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Sortilèges"
 
@@ -2349,7 +2346,7 @@ msgstr "Déposer tout"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Déposer"
@@ -2414,7 +2411,7 @@ msgstr "Basique"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
@@ -2423,7 +2420,7 @@ msgstr "Raccourcis"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Fenêtres"
 
@@ -2439,7 +2436,7 @@ msgstr "Emoticônes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Conversation"
 
@@ -3543,7 +3540,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Onglets"
 
@@ -4016,7 +4013,7 @@ msgstr "Sélectionner les monstres par ordre de distance"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4189,7 +4186,7 @@ msgstr "Activer les notifications de poids"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4577,9 +4574,7 @@ msgstr ""
 "interfaces tactiles)"
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Nom"
 
@@ -5219,163 +5214,154 @@ msgstr "QE"
 msgid "Quests"
 msgstr "Quêtes"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "TdR"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Testeur de robot"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "Sta"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Tuer les statistiques"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Émoticône"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Statut"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "Equ"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Équipement"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "Inv"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventaire"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr "CA"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Panier"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "CRT"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "Cmp"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Compétences"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "Soc"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "Rac"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "Sor"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "Jet"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Connaissais-tu le"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "BTQ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "TNU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr "MAJ"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr "Mises à jour"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr "CB"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banque"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "CRT"
@@ -5383,29 +5369,29 @@ msgstr "CRT"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr "FEN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "Cfg"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5426,22 +5412,6 @@ msgstr "Retirer"
 msgid "Deposit"
 msgstr "Dépôt"
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Testeur de Robot"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Réinitialiser"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Résultat"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6319,6 +6289,11 @@ msgstr "Suivant"
 msgid "Submit"
 msgstr "Soumettre"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Réinitialiser"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7985,82 +7960,77 @@ msgstr "Fenêtre de commandes"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Fenêtre du testeur de robot"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Fenêtre - Qui est en ligne ?"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Connaissais-tu la fenêtre ?"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Fenêtre de Quêtes"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr "Fenêtre de mises à jour"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr "Fenêtre Panier"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Fenêtre de Quêtes"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Onglet de dialogue précédent"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Onglet de dialogue suivant"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr "Onglet de Raccourcis Précédent"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr "Onglet de Raccourcis Suivant"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr "Onglet de Commandes Précédent"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr "Onglet de Commandes Suivant"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr "Onglet d'inventaire précédent"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr "Onglet d'inventaire suivant"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr "Vider la fenêtre des dépôts"
 
@@ -9785,6 +9755,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Cacher le bouclier"
 
+#~ msgid "BC"
+#~ msgstr "TdR"
+
+#~ msgid "Bot checker"
+#~ msgstr "Testeur de robot"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Testeur de Robot"
+
+#~ msgid "Result"
+#~ msgstr "Résultat"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Temps avant l'arrivée de Jack0 :"
 
@@ -9796,3 +9778,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Échec de l'envoi comme émetteur ou caractère invalide."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Fenêtre du testeur de robot"
diff --git a/po/id.po b/po/id.po
index 2390783f8..2cb0fdb00 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
@@ -312,12 +312,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
@@ -489,7 +489,7 @@ msgstr "Gelembung mengambang"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Pengaturan"
@@ -677,36 +677,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "pewarnacmd sumberpewarnastring datadst"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Umum"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Tangkapan layar disimpan sebagai %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan tangkapan layar!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server hilang."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
@@ -1636,13 +1636,12 @@ msgstr "Dagang"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Serang"
 
@@ -1699,20 +1698,18 @@ msgstr "Sembunyikan"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Jalan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Berbicara"
 
@@ -1914,7 +1911,7 @@ msgstr "Gerakkan kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Perlengkapan"
@@ -1927,7 +1924,7 @@ msgstr "Bersihkan perlengkapan"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Mantra"
 
@@ -2333,7 +2330,7 @@ msgstr "Buang semua"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Buang"
@@ -2398,7 +2395,7 @@ msgstr "Dasar"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Tombol cepat"
 
@@ -2407,7 +2404,7 @@ msgstr "Tombol cepat"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Jendela"
 
@@ -2423,7 +2420,7 @@ msgstr "Emosi"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Obrolan"
 
@@ -3525,7 +3522,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Tab"
 
@@ -3996,7 +3993,7 @@ msgstr "Tandai target monster"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4169,7 +4166,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4546,9 +4543,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Nama"
 
@@ -5180,163 +5175,154 @@ msgstr ""
 msgid "Quests"
 msgstr ""
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr ""
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Stat membunuh"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Emotikon"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Perlengkapan"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Perbekalan"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Keahlian"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Apakah kamu tahu"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "A"
@@ -5344,29 +5330,29 @@ msgstr "A"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5387,22 +5373,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Pengecek Bot"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Reset"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Hasil"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6273,6 +6243,11 @@ msgstr "Berikutnya"
 msgid "Submit"
 msgstr "Masukan"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Reset"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7933,82 +7908,77 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Apakah kamu mengetahui jendela"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Setingan standar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9703,6 +9673,12 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
+#~ msgid "Bot Checker"
+#~ msgstr "Pengecek Bot"
+
+#~ msgid "Result"
+#~ msgstr "Hasil"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "waktu sebelum Jacko kembali:"
 
diff --git a/po/it.po b/po/it.po
index 090e77b3e..bb0a545b7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
@@ -317,12 +317,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Visibile nella mappa"
 
@@ -495,7 +495,7 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Impostazioni"
@@ -683,36 +683,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Generale"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Errore di rete"
 
@@ -1644,13 +1644,12 @@ msgstr "Commercia"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Attacco"
 
@@ -1707,20 +1706,18 @@ msgstr "Nascondi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Movimento"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Parla"
 
@@ -1922,7 +1919,7 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Attrezzatura"
@@ -1935,7 +1932,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Spells"
 
@@ -2341,7 +2338,7 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Lascia"
@@ -2406,7 +2403,7 @@ msgstr "Base"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
@@ -2415,7 +2412,7 @@ msgstr "Shortcuts"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Finestre"
 
@@ -2431,7 +2428,7 @@ msgstr "Faccine"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Chat"
 
@@ -3533,7 +3530,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Tabs"
 
@@ -4006,7 +4003,7 @@ msgstr "Ciclo di target sui nemici"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4179,7 +4176,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4556,9 +4553,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Nome"
 
@@ -5196,163 +5191,154 @@ msgstr ""
 msgid "Quests"
 msgstr "Missioni"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "BC"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Bot checker"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Statistiche uccisioni"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Faccine"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Stato"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventario"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Carrello"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Abilità"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Sociale"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Suggerimenti"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "A"
@@ -5360,29 +5346,29 @@ msgstr "A"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5403,22 +5389,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Bot Checker"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Reimposta"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Risultato"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6290,6 +6260,11 @@ msgstr "Prossimo"
 msgid "Submit"
 msgstr "Invia"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Reimposta"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7952,82 +7927,77 @@ msgstr "Finestra Comandi"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Finestra Bot Checker"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Finestra Giocatori Online"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Finestra Suggerimenti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Finestra delle missioni"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Finestra delle missioni"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Social Tab precedente"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Social Tab successivo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9735,6 +9705,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Nascondi lo scudo"
 
+#~ msgid "BC"
+#~ msgstr "BC"
+
+#~ msgid "Bot checker"
+#~ msgstr "Bot checker"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Bot Checker"
+
+#~ msgid "Result"
+#~ msgstr "Risultato"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Tempo rimanente prima della comparsa del jacko:"
 
@@ -9746,3 +9728,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "La lettera non è valida oppure non è stato possibile inviarla."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Finestra Bot Checker"
diff --git a/po/ja.po b/po/ja.po
index 7d4edc436..a6bf803ea 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
@@ -312,12 +312,12 @@ msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
@@ -489,7 +489,7 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "設定"
@@ -677,36 +677,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "デバッグ"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
@@ -1635,13 +1635,12 @@ msgstr "トレード"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "攻撃"
 
@@ -1698,20 +1697,18 @@ msgstr "消す"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "動く"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "話す"
 
@@ -1913,7 +1910,7 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "服装"
@@ -1926,7 +1923,7 @@ msgstr "服装を削除する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "呪文"
 
@@ -2332,7 +2329,7 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "落とす"
@@ -2397,7 +2394,7 @@ msgstr "基本"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "ショートカット"
 
@@ -2406,7 +2403,7 @@ msgstr "ショートカット"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "ウィンドウ"
 
@@ -2422,7 +2419,7 @@ msgstr "スマイリー"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "チャット"
 
@@ -3524,7 +3521,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "タブ"
 
@@ -3997,7 +3994,7 @@ msgstr "選択したモンスターを円で表示"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4170,7 +4167,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4547,9 +4544,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "名前"
 
@@ -5181,163 +5176,154 @@ msgstr "QE"
 msgid "Quests"
 msgstr "クエスト"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "BC"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "ボットチェッカー"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "キル統計"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "スマイリー"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "ステータス"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "装着品"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "インベントリー"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "カート"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "地図"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "スキル"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "ソーシャル"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "豆知識"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "地図"
@@ -5345,29 +5331,29 @@ msgstr "地図"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5388,22 +5374,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "ボットチェッカー"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "リセット"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "結果"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6273,6 +6243,11 @@ msgstr "次"
 msgid "Submit"
 msgstr "決定"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "リセット"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7935,82 +7910,77 @@ msgstr "コマンドウインドウ"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "ボットチェッカーウィンドウ"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "オンラインユーザーウインドウ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "豆知識窓"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "クエスト窓"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "クエスト窓"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "前ソーシャルタブ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "次ソーシャルタブ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9718,6 +9688,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "シールドスプライトを隠す"
 
+#~ msgid "BC"
+#~ msgstr "BC"
+
+#~ msgid "Bot checker"
+#~ msgstr "ボットチェッカー"
+
+#~ msgid "Bot Checker"
+#~ msgstr "ボットチェッカー"
+
+#~ msgid "Result"
+#~ msgstr "結果"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "次のJackOの出現まで:"
 
@@ -9729,3 +9711,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "文字か差出人が無効の為送信に失敗しました."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "ボットチェッカーウィンドウ"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 3ff2fd9bb..b6b1359ce 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: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+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"
@@ -305,12 +305,12 @@ msgid "Accepting incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr ""
 
@@ -483,7 +483,7 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
@@ -671,36 +671,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr ""
 
@@ -1629,13 +1629,12 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr ""
 
@@ -1692,20 +1691,18 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr ""
 
@@ -1907,7 +1904,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr ""
@@ -1920,7 +1917,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr ""
 
@@ -2325,7 +2322,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr ""
@@ -2390,7 +2387,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr ""
 
@@ -2399,7 +2396,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2415,7 +2412,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr ""
 
@@ -3517,7 +3514,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr ""
 
@@ -3988,7 +3985,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4161,7 +4158,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4538,9 +4535,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr ""
 
@@ -5172,192 +5167,183 @@ msgstr ""
 msgid "Quests"
 msgstr ""
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr ""
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr ""
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr ""
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr ""
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 msgid "MA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5378,22 +5364,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr ""
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr ""
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr ""
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6256,6 +6226,11 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr ""
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7916,81 +7891,76 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 msgid "Quick settings window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 5986efc0a..a8bb8dde3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -309,12 +309,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
@@ -487,7 +487,7 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configureren"
@@ -675,36 +675,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1635,13 +1635,12 @@ msgstr "Handel"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Aanvallen"
 
@@ -1698,20 +1697,18 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Beweeg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Spreken"
 
@@ -1913,7 +1910,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Kleren"
@@ -1926,7 +1923,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Spreuken"
 
@@ -2331,7 +2328,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Neerleggen"
@@ -2396,7 +2393,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
@@ -2405,7 +2402,7 @@ msgstr "Snelkoppeling"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2421,7 +2418,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Chat"
 
@@ -3523,7 +3520,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr ""
 
@@ -3994,7 +3991,7 @@ msgstr "Doorloop monsterdoelwitten"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4167,7 +4164,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4544,9 +4541,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Naam"
 
@@ -5184,163 +5179,154 @@ msgstr ""
 msgid "Quests"
 msgstr ""
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "BC"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Bot controle"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "UITR"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Uitrusting"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventaris"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Winkelkar"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "VAAR"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Vaardigheden"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Sociaal"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "SK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "NL"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "WU"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Weet u"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "WINKEL"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "KL"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "MAP"
@@ -5348,29 +5334,29 @@ msgstr "MAP"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "CONF"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5391,22 +5377,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Bot Controleerder"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Reset"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Resultaat"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6277,6 +6247,11 @@ msgstr "Volgende"
 msgid "Submit"
 msgstr "Indienen"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Reset"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7939,82 +7914,77 @@ msgstr "Commando Venster"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Bot Controle Venster"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Wie Is Online Venster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Weet u Venster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Snel neerleggingsvenster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Vorige Sociale Tab"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Volgende Sociale Tab"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9719,5 +9689,20 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Verberg het schild"
 
+#~ msgid "BC"
+#~ msgstr "BC"
+
+#~ msgid "Bot checker"
+#~ msgstr "Bot controle"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Bot Controleerder"
+
+#~ msgid "Result"
+#~ msgstr "Resultaat"
+
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Kon niet zenden als zender, of de brief is ongeldig."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Bot Controle Venster"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 5986efc0a..a8bb8dde3 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -309,12 +309,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
@@ -487,7 +487,7 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configureren"
@@ -675,36 +675,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1635,13 +1635,12 @@ msgstr "Handel"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Aanvallen"
 
@@ -1698,20 +1697,18 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Beweeg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Spreken"
 
@@ -1913,7 +1910,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Kleren"
@@ -1926,7 +1923,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Spreuken"
 
@@ -2331,7 +2328,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Neerleggen"
@@ -2396,7 +2393,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
@@ -2405,7 +2402,7 @@ msgstr "Snelkoppeling"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2421,7 +2418,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Chat"
 
@@ -3523,7 +3520,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr ""
 
@@ -3994,7 +3991,7 @@ msgstr "Doorloop monsterdoelwitten"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4167,7 +4164,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4544,9 +4541,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Naam"
 
@@ -5184,163 +5179,154 @@ msgstr ""
 msgid "Quests"
 msgstr ""
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "BC"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Bot controle"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "UITR"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Uitrusting"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventaris"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Winkelkar"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "VAAR"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Vaardigheden"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Sociaal"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "SK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "NL"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "WU"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Weet u"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "WINKEL"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "KL"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "MAP"
@@ -5348,29 +5334,29 @@ msgstr "MAP"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "CONF"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5391,22 +5377,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Bot Controleerder"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Reset"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Resultaat"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6277,6 +6247,11 @@ msgstr "Volgende"
 msgid "Submit"
 msgstr "Indienen"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Reset"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7939,82 +7914,77 @@ msgstr "Commando Venster"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Bot Controle Venster"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Wie Is Online Venster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Weet u Venster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Snel neerleggingsvenster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Vorige Sociale Tab"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Volgende Sociale Tab"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9719,5 +9689,20 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Verberg het schild"
 
+#~ msgid "BC"
+#~ msgstr "BC"
+
+#~ msgid "Bot checker"
+#~ msgstr "Bot controle"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Bot Controleerder"
+
+#~ msgid "Result"
+#~ msgstr "Resultaat"
+
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Kon niet zenden als zender, of de brief is ongeldig."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Bot Controle Venster"
diff --git a/po/pl.po b/po/pl.po
index 81212f34e..56aa039e4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
@@ -313,12 +313,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
@@ -492,7 +492,7 @@ msgstr "Bąbelek nad głową"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Konfiguracja"
@@ -680,36 +680,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Ogólny"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Zrzut ekranu zapisany jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Błąd sieci"
 
@@ -1641,13 +1641,12 @@ msgstr "Handel"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Atak"
 
@@ -1704,20 +1703,18 @@ msgstr "Wysadź w powietrze"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Podejdź"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Rozmowa"
 
@@ -1919,7 +1916,7 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Stroje"
@@ -1932,7 +1929,7 @@ msgstr "Usuń ubiór"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Zaklęcia"
 
@@ -2338,7 +2335,7 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Upuść"
@@ -2403,7 +2400,7 @@ msgstr "Podstawowe"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Skróty"
 
@@ -2412,7 +2409,7 @@ msgstr "Skróty"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Okna"
 
@@ -2428,7 +2425,7 @@ msgstr "Emotki"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Czat"
 
@@ -3532,7 +3529,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Zakładki"
 
@@ -4005,7 +4002,7 @@ msgstr "Przewijaj namierzanie potworów"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4178,7 +4175,7 @@ msgstr "Aktywuj powiadomienia dotyczące wagi."
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4557,9 +4554,7 @@ msgstr ""
 "(przydatne dla ekranów dotykowych)"
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Imię"
 
@@ -5196,163 +5191,154 @@ msgstr "OM"
 msgid "Quests"
 msgstr "Misje"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "WB"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Wykrywacz botów"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "SB"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Statystyki ataku:"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Emotki"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "TX"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Stan"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "EKW"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Ekwipunek"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INW"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inwentarz"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Wózek"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Zdolności"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Społeczność"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "SK"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "MG"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "UP"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "WŻ"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Czy wiesz, że..."
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "SKP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "SÓ"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr "AKT"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr "Aktualizacje"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "MAP"
@@ -5360,29 +5346,29 @@ msgstr "MAP"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr "OKN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5403,22 +5389,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Wykrywacz botów"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Resetuj"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Rezultat"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6297,6 +6267,11 @@ msgstr "Dalej"
 msgid "Submit"
 msgstr "Zatwierdź"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Resetuj"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7959,82 +7934,77 @@ msgstr "Okno poleceń"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Okno wykrywacza botów"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Okno graczy online"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Okno \"Czy wiesz że...\""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Okno Misji"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr "Okno Aktualizacji"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Okno Misji"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Poprzednia zakładka społeczna"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Następna zakładka społeczna"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr "Poprzednia zakładka skrótów"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr "Następna zakładka skrótów"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr "Poprzednia zakładka komend"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr "Następna zakładka komend"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9739,6 +9709,18 @@ msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 #~ msgid "Hide shield sprite"
 #~ msgstr "Chowaj obrazek tarczy"
 
+#~ msgid "BC"
+#~ msgstr "WB"
+
+#~ msgid "Bot checker"
+#~ msgstr "Wykrywacz botów"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Wykrywacz botów"
+
+#~ msgid "Result"
+#~ msgstr "Rezultat"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Następny spawn Jack-O:"
 
@@ -9751,3 +9733,6 @@ msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr ""
 #~ "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Okno wykrywacza botów"
diff --git a/po/pt.po b/po/pt.po
index 4001c6dd3..41296c0de 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
@@ -309,12 +309,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
@@ -487,7 +487,7 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configurar"
@@ -675,36 +675,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em: %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1637,13 +1637,12 @@ msgstr "Negócios"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Atacar"
 
@@ -1700,20 +1699,18 @@ msgstr "Desaparecer"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Mover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Falar"
 
@@ -1915,7 +1912,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Roupas"
@@ -1928,7 +1925,7 @@ msgstr "Limpar equipamento"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Feitiços"
 
@@ -2334,7 +2331,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Descartar"
@@ -2399,7 +2396,7 @@ msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Atalhos"
 
@@ -2408,7 +2405,7 @@ msgstr "Atalhos"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2424,7 +2421,7 @@ msgstr "Emoções"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Chat"
 
@@ -3526,7 +3523,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Abas"
 
@@ -3999,7 +3996,7 @@ msgstr "Alvo de monstros em ciclo"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4172,7 +4169,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4549,9 +4546,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Nome"
 
@@ -5187,163 +5182,154 @@ msgstr "MSS"
 msgid "Quests"
 msgstr "Missões"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "AB"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Analisador de bot"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "EST"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Smileys"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "JC"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Equipamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventário"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Carrinho"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "AT"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "FE"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "DE"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "VS"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Você sabia"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "MAP"
@@ -5351,29 +5337,29 @@ msgstr "MAP"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5394,22 +5380,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Analizador de bot"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Resetar"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Resultado"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6286,6 +6256,11 @@ msgstr "Próximo"
 msgid "Submit"
 msgstr "Enviar"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Resetar"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7947,82 +7922,77 @@ msgstr "Janela Comandos"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Janela Analisador de bot"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Janela Quem está online"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Janela Você sabia"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Janela de Missões"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Janela de Missões"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Aba social anterior"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9732,6 +9702,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Ocultar sprite de escudo"
 
+#~ msgid "BC"
+#~ msgstr "AB"
+
+#~ msgid "Bot checker"
+#~ msgstr "Analisador de bot"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Analizador de bot"
+
+#~ msgid "Result"
+#~ msgstr "Resultado"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Tempo para próximo JackO:"
 
@@ -9743,3 +9725,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Falha ao enviar como remetente ou a carta é inválida."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Janela Analisador de bot"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 35c66e0b9..d8b7fa06a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -322,12 +322,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Mapa visivel"
 
@@ -500,7 +500,7 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configurar"
@@ -688,36 +688,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1650,13 +1650,12 @@ msgstr "Negociação"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Atacar"
 
@@ -1713,20 +1712,18 @@ msgstr "Desaparecer"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Mover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Falar"
 
@@ -1928,7 +1925,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Roupas"
@@ -1941,7 +1938,7 @@ msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Feitiços"
 
@@ -2347,7 +2344,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Descartar"
@@ -2412,7 +2409,7 @@ msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Atalhos"
 
@@ -2421,7 +2418,7 @@ msgstr "Atalhos"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Janelas"
 
@@ -2437,7 +2434,7 @@ msgstr "Emoticons"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Chat"
 
@@ -3539,7 +3536,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Abas"
 
@@ -4012,7 +4009,7 @@ msgstr "Alvo de monstros em ciclo"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4185,7 +4182,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4566,9 +4563,7 @@ msgstr ""
 "esquerdo (útil para interfaces de toque)"
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Nome"
 
@@ -5204,163 +5199,154 @@ msgstr "MSS"
 msgid "Quests"
 msgstr "Missões"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "AB"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Analisador de bot"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "EST"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Carinhas"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Equipamento"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventário"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr "CA"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Carrinho"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "AT"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "FE"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "DE"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Você Sabia"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "LOJ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "RO"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr "CIMA"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr "Atualizações"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr "BA"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Banco"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "MAP"
@@ -5368,29 +5354,29 @@ msgstr "MAP"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5411,22 +5397,6 @@ msgstr "Sacar"
 msgid "Deposit"
 msgstr "Depositar"
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Analizador de bot"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Resetar"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Resultado"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6304,6 +6274,11 @@ msgstr "Próximo"
 msgid "Submit"
 msgstr "Enviar"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Resetar"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7965,82 +7940,77 @@ msgstr "Janela Comandos"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Janela Analisador de bot"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Janela Quem está online"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Janela Você Sabia"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Janela de Missões"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr "Janela de Atualizações"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr "Janela Carrinho"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Janela de Missões"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Aba social anterior"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr "Aba de Atalhos Anterior"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr "Aba de Atalhos Seguinte"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr "Aba de Comandos Anterior"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr "Aba de Comandos Seguinte"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr "Aba anterior do inventário"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr "Próxima aba do inventário"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr "Limpar janela de descartes"
 
@@ -9756,6 +9726,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Ocultar sprite de escudo"
 
+#~ msgid "BC"
+#~ msgstr "AB"
+
+#~ msgid "Bot checker"
+#~ msgstr "Analisador de bot"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Analizador de bot"
+
+#~ msgid "Result"
+#~ msgstr "Resultado"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Tempo para próxima aparição do JackO:"
 
@@ -9767,3 +9749,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Falha ao enviar como remetente ou a carta é inválida."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Janela Analisador de bot"
diff --git a/po/ru.po b/po/ru.po
index ef07ee064..a97a29ce1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-11 11:22+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
@@ -317,12 +317,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
@@ -496,7 +496,7 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Настройка"
@@ -684,36 +684,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_строка_цвета файл_назначения"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Общие"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Отладка"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Снимок экрана сохранен как %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Ошибка сети"
 
@@ -1646,13 +1646,12 @@ msgstr "Торговать"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Атака"
 
@@ -1709,20 +1708,18 @@ msgstr "Уничтожить"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Движение"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Разговор"
 
@@ -1924,7 +1921,7 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Наряды"
@@ -1937,7 +1934,7 @@ msgstr "Очистить наряд"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Заклинания"
 
@@ -2343,7 +2340,7 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Бросить"
@@ -2408,7 +2405,7 @@ msgstr "Основное"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Горячие клавиши"
 
@@ -2417,7 +2414,7 @@ msgstr "Горячие клавиши"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Окна"
 
@@ -2433,7 +2430,7 @@ msgstr "Смайлы"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Чат"
 
@@ -3535,7 +3532,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Страницы"
 
@@ -4008,7 +4005,7 @@ msgstr "Прокручивать прицел по монстрам"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4181,7 +4178,7 @@ msgstr "Включить напоминание о весе"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4565,9 +4562,7 @@ msgid ""
 msgstr "Эмулировать правую кнопку мыши при помощи долгого нажатия левой кнопки"
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Имя"
 
@@ -5205,163 +5200,154 @@ msgstr "КВ"
 msgid "Quests"
 msgstr "Квесты"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "ДБ"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Окно детектора ботов"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "СА"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Статистика убийств"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Смайлы"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "ЧАТ"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "СО"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Состояние"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "СН"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Снаряжение"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "ИНВ"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Инвентарь"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr "ТЕ"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Телега"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "КАР"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "УМ"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Навыки"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "ОБЩ"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Общество"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "ГК"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "ЗАК"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "БР"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "ВЗ"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Знаете ли вы"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "МАГ"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "НАР"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr "ОБ"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr "Обновления"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr "БА"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Банк"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "КАР"
@@ -5369,29 +5355,29 @@ msgstr "КАР"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "ОТЛ"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr "ОКН"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "ОПЦ"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5412,22 +5398,6 @@ msgstr "Забрать"
 msgid "Deposit"
 msgstr "Положить"
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Окно детектора ботов"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Сбросить"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Результат"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6307,6 +6277,11 @@ msgstr "Следующий"
 msgid "Submit"
 msgstr "Применить"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Сбросить"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7969,82 +7944,77 @@ msgstr "Окно команд"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Окно детектора ботов"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Окно кто онлайн"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Окно \"Знаете ли вы...\""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Окно квестов"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr "Окно обновлений"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr "Прицеп"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Окно квестов"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Предыдущая закладка общества"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Следующая закладка общества"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr "Прерыдущая страница быстрого использования"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr "Следующая страница быстрого использования"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr "Прерыдущая страница команд"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr "Следующая страница команд"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr "Предыдущая вкладка инвентаря"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr "Следующая вкладка инвентаря"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr "Очистить окно бросания"
 
@@ -9754,6 +9724,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Спрятать картинку щита"
 
+#~ msgid "BC"
+#~ msgstr "ДБ"
+
+#~ msgid "Bot checker"
+#~ msgstr "Окно детектора ботов"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Окно детектора ботов"
+
+#~ msgid "Result"
+#~ msgstr "Результат"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Время до появления jacko:"
 
@@ -9765,3 +9747,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Окно детектора ботов"
diff --git a/po/sv.po b/po/sv.po
index 862556e08..4f34485e0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
@@ -306,12 +306,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Synlig på karta"
 
@@ -484,7 +484,7 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Inställningar"
@@ -672,36 +672,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1630,13 +1630,12 @@ msgstr "Trade"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Attackera"
 
@@ -1693,20 +1692,18 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Flytta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Prata med"
 
@@ -1908,7 +1905,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -1921,7 +1918,7 @@ msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Spells"
 
@@ -2327,7 +2324,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Släng"
@@ -2392,7 +2389,7 @@ msgstr "Enkel"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Genvägar"
 
@@ -2401,7 +2398,7 @@ msgstr "Genvägar"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Fönster"
 
@@ -2417,7 +2414,7 @@ msgstr "Emotes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Chat"
 
@@ -3519,7 +3516,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Flikar"
 
@@ -3992,7 +3989,7 @@ msgstr "Cycle monsters targets"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4165,7 +4162,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4543,9 +4540,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Namn"
 
@@ -5181,163 +5176,154 @@ msgstr "QE"
 msgid "Quests"
 msgstr "Uppdrag"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "BC"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Bot checker"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Dödsstatistik"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Equipment"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventory"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Cart"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Skills"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Visste du att"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "MAP"
@@ -5345,29 +5331,29 @@ msgstr "MAP"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5388,22 +5374,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Bot Checker"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Återställ"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Resultat"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6282,6 +6252,11 @@ msgstr "Nästa"
 msgid "Submit"
 msgstr "Submit"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Återställ"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7944,82 +7919,77 @@ msgstr "Kommandofönster"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Bot Checker-fönster"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Who Is Online-fönster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Visste du-fönster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Uppdragsfönster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Uppdragsfönster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Föregående Social-flik"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Nästa Social-flik"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9727,6 +9697,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Dölj sköld"
 
+#~ msgid "BC"
+#~ msgstr "BC"
+
+#~ msgid "Bot checker"
+#~ msgstr "Bot checker"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Bot Checker"
+
+#~ msgid "Result"
+#~ msgstr "Resultat"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Tid tills jacko spawnar:"
 
@@ -9738,3 +9720,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Misslyckades att sända som avsändare eller felaktig bokstav."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Bot Checker-fönster"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 862556e08..4f34485e0 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
@@ -306,12 +306,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Synlig på karta"
 
@@ -484,7 +484,7 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Inställningar"
@@ -672,36 +672,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1630,13 +1630,12 @@ msgstr "Trade"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Attackera"
 
@@ -1693,20 +1692,18 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Flytta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Prata med"
 
@@ -1908,7 +1905,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -1921,7 +1918,7 @@ msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Spells"
 
@@ -2327,7 +2324,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Släng"
@@ -2392,7 +2389,7 @@ msgstr "Enkel"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Genvägar"
 
@@ -2401,7 +2398,7 @@ msgstr "Genvägar"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Fönster"
 
@@ -2417,7 +2414,7 @@ msgstr "Emotes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Chat"
 
@@ -3519,7 +3516,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Flikar"
 
@@ -3992,7 +3989,7 @@ msgstr "Cycle monsters targets"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4165,7 +4162,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4543,9 +4540,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Namn"
 
@@ -5181,163 +5176,154 @@ msgstr "QE"
 msgid "Quests"
 msgstr "Uppdrag"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "BC"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Bot checker"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "KS"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Dödsstatistik"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Smilies"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "CH"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "STA"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Status"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Equipment"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Inventory"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Cart"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "MAP"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Skills"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOC"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "SH"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "SP"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "DR"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Visste du att"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "SHP"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "OU"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "MAP"
@@ -5345,29 +5331,29 @@ msgstr "MAP"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "DBG"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr "WIN"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5388,22 +5374,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Bot Checker"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Återställ"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Resultat"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6282,6 +6252,11 @@ msgstr "Nästa"
 msgid "Submit"
 msgstr "Submit"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Återställ"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7944,82 +7919,77 @@ msgstr "Kommandofönster"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Bot Checker-fönster"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Who Is Online-fönster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Visste du-fönster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Uppdragsfönster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Uppdragsfönster"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Föregående Social-flik"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Nästa Social-flik"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9727,6 +9697,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Dölj sköld"
 
+#~ msgid "BC"
+#~ msgstr "BC"
+
+#~ msgid "Bot checker"
+#~ msgstr "Bot checker"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Bot Checker"
+
+#~ msgid "Result"
+#~ msgstr "Resultat"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Tid tills jacko spawnar:"
 
@@ -9738,3 +9720,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Misslyckades att sända som avsändare eller felaktig bokstav."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Bot Checker-fönster"
diff --git a/po/tr.po b/po/tr.po
index 00df4c084..b5d9f76f6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
@@ -308,12 +308,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Haritada görünür"
 
@@ -486,7 +486,7 @@ msgstr "Yüzen balon"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Ayarlar"
@@ -674,36 +674,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Genel"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Hata ayıklama"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Ekran görüntüsü %s olarak kaydedildi"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Ekran görüntüsü kaydı başarısız!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
@@ -1636,13 +1636,12 @@ msgstr "Takas"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Saldırı"
 
@@ -1699,20 +1698,18 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Taşı"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Konuş"
 
@@ -1914,7 +1911,7 @@ msgstr "Hareket kamerası"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Kıyafetler"
@@ -1927,7 +1924,7 @@ msgstr "Kıyafetlerin hepsini çıkart"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Büyüler"
 
@@ -2332,7 +2329,7 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Bırak"
@@ -2397,7 +2394,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
@@ -2406,7 +2403,7 @@ msgstr "Kısayollar"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2422,7 +2419,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Sohbet"
 
@@ -3525,7 +3522,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr ""
 
@@ -3998,7 +3995,7 @@ msgstr "Canavar hedeflerini sırayla değiştir"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4171,7 +4168,7 @@ msgstr "Ağırlık bildirimlerini etkinleştir"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4548,9 +4545,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "İsim"
 
@@ -5182,163 +5177,154 @@ msgstr ""
 msgid "Quests"
 msgstr ""
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "BK"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Bot kontrolörü"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "Öİ"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Öldürme istatistikleri"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr ""
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "DRM"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Durum"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "EKP"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Ekipman"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "ENV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Envanter"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "YTN"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Yetenekler"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "SOS"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Sosyal"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "KY"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "BY"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr ""
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "A"
@@ -5346,29 +5332,29 @@ msgstr "A"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "AYR"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5389,22 +5375,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Bot Kontrolörü"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Sıfırla"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Sonuç"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6274,6 +6244,11 @@ msgstr "İleri"
 msgid "Submit"
 msgstr "Onayla"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Sıfırla"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7936,82 +7911,77 @@ msgstr "Komut Penceresi"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Bot Kontrolörü Penceresi"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Kimler Online Penceresi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Hızlı düşür Penceresi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Önceki Sosyal Sekmesi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Sonraki Sosyal Sekmesi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9708,5 +9678,20 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Kalkan görüntüsünü gizle"
 
+#~ msgid "BC"
+#~ msgstr "BK"
+
+#~ msgid "Bot checker"
+#~ msgstr "Bot kontrolörü"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Bot Kontrolörü"
+
+#~ msgid "Result"
+#~ msgstr "Sonuç"
+
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Gönderen olarak gönderme yapılamadı ya da hatalı karakter."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Bot Kontrolörü Penceresi"
diff --git a/po/uk.po b/po/uk.po
index fbb719659..350397018 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/manaplus/"
@@ -311,12 +311,12 @@ msgid "Accepting incoming trade requests"
 msgstr "Приймання вхідних пропозицій торгівлі"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "Видимий на мапі"
 
@@ -490,7 +490,7 @@ msgstr "Плаваюча бульбашка"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Налаштування"
@@ -678,36 +678,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_рядків_кольору файл_призначення"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "Загальне"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "Зневадження"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Скріншот збережено як %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "Збереження скріншоту провалилось!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "Втрачено з'єднання з сервером."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "Мережева помилка"
 
@@ -1638,13 +1638,12 @@ msgstr "Торгівля"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "Атака"
 
@@ -1701,20 +1700,18 @@ msgstr "Знищити"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "Рух"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "Діалог"
 
@@ -1916,7 +1913,7 @@ msgstr "Рухати камеру"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "Швидке спорядження"
@@ -1929,7 +1926,7 @@ msgstr "Видалити швидке спорядження"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "Заклинання"
 
@@ -2335,7 +2332,7 @@ msgstr "Кинути все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "Кинути"
@@ -2400,7 +2397,7 @@ msgstr "Загальне"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "Швидкі клавіші"
 
@@ -2409,7 +2406,7 @@ msgstr "Швидкі клавіші"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr "Вікна"
 
@@ -2425,7 +2422,7 @@ msgstr "Смайлики"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "Чат"
 
@@ -3527,7 +3524,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "Вкладки"
 
@@ -4000,7 +3997,7 @@ msgstr "Прокручувати мобів по колу"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4173,7 +4170,7 @@ msgstr "Повідомляти про вагове перенавантажен�
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4555,9 +4552,7 @@ msgstr ""
 "інтерфейсах)"
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "Назва"
 
@@ -5189,163 +5184,154 @@ msgstr "КВ"
 msgid "Quests"
 msgstr "Квести"
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr "ПБ"
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "Перевірка ботів"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr "СА"
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "Статистика атак"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "Смайлики"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr "ЧАТ"
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr "СТН"
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "Стан"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr "СПР"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "Спорядження"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr "СУМ"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "Сумка"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr "Візок"
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr "МАП"
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "ВМІ"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "Вміння"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr "СУС"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr "Спільнота"
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr "ШП"
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr "ЗК"
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr "ДР"
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "ЧВВ"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "Чи вам відомо"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr "КРА"
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr "ШС"
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr "ОН"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr "Оновлення"
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr "БА"
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr "Банк"
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "МАП"
@@ -5353,29 +5339,29 @@ msgstr "МАП"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr "ЗНВ"
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr "ВІК"
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "НАЛ"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5396,22 +5382,6 @@ msgstr "Зняти"
 msgid "Deposit"
 msgstr "Покласти"
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "Перевірка ботів"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "Скинути"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "Результат"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6291,6 +6261,11 @@ msgstr "Далі"
 msgid "Submit"
 msgstr "Відправити"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "Скинути"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7951,82 +7926,77 @@ msgstr "Вікно команд"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "Вікно перевірки ботів"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "Вікно \"Хто онлайн\""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "Вікно \"Чи вам відомо\""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr "Вікно квестів"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr "Вікно оновлення"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "Вікно квестів"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "Попередня вкладка вікна спільноти"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr "Наступна вкладка вікна спільноти"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr "Попередня вкладка швидких предметів"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr "Наступна вкладка швидких предметів"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr "Попередня вкладка вікна команд"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr "Наступна вкладка вікна команд"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr "Попередня вкладка сумки"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr "Наступна вкладка сумки"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9731,6 +9701,18 @@ msgstr ""
 #~ msgid "Hide shield sprite"
 #~ msgstr "Не показувати щит"
 
+#~ msgid "BC"
+#~ msgstr "ПБ"
+
+#~ msgid "Bot checker"
+#~ msgstr "Перевірка ботів"
+
+#~ msgid "Bot Checker"
+#~ msgstr "Перевірка ботів"
+
+#~ msgid "Result"
+#~ msgstr "Результат"
+
 #~ msgid "Time before jacko spawn:"
 #~ msgstr "Час до повернення Джека:"
 
@@ -9742,3 +9724,6 @@ msgstr ""
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "Неможливо надіслати - адресант або лист некоректні."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "Вікно перевірки ботів"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 439260d9d..decf904b3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-07 01:20+0300\n"
+"POT-Creation-Date: 2015-05-07 23:50+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -313,12 +313,12 @@ msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
 #. TRANSLATORS: quick tab in settings
-#: src/actions/windows.cpp:329 src/gui/widgets/tabs/setup_quick.cpp:45
+#: src/actions/windows.cpp:322 src/gui/widgets/tabs/setup_quick.cpp:45
 msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1361
+#: src/actormanager.cpp:1358
 msgid "Visible on map"
 msgstr "在地图上可见"
 
@@ -490,7 +490,7 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:913 src/gui/windowmenu.cpp:171
+#: src/client.cpp:913 src/gui/windowmenu.cpp:168
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "设置"
@@ -678,36 +678,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:253 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:273 src/gui/windowmenu.cpp:158
+#: src/game.cpp:271 src/gui/windowmenu.cpp:155
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:567
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:580
+#: src/game.cpp:577
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:667
+#: src/game.cpp:662
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:670
+#: src/game.cpp:665
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1636,13 +1636,12 @@ msgstr "交易"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
-#: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
+#: src/input/pages/basic.cpp:42 src/net/eathena/generalhandler.cpp:406
+#: src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "攻击"
 
@@ -1699,20 +1698,18 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#. TRANSLATORS: bot checker window table header
 #: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:267
 #: src/gui/popups/popupmenu.cpp:497 src/gui/popups/popupmenu.cpp:653
 #: src/gui/popups/popupmenu.cpp:819 src/gui/popups/popupmenu.cpp:884
-#: src/gui/setupinputpages.cpp:45 src/gui/windows/botcheckerwindow.cpp:92
+#: src/gui/setupinputpages.cpp:45
 msgid "Move"
 msgstr "移动"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: talk with npc
-#. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: input action name
-#: src/gui/popups/popupmenu.cpp:248 src/gui/windows/botcheckerwindow.cpp:90
-#: src/input/pages/basic.cpp:90 src/resources/db/npcdb.cpp:146
+#: src/gui/popups/popupmenu.cpp:248 src/input/pages/basic.cpp:90
+#: src/resources/db/npcdb.cpp:146
 msgid "Talk"
 msgstr "说话"
 
@@ -1914,7 +1911,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windowmenu.cpp:139 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "套装"
@@ -1927,7 +1924,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:126
+#: src/gui/popups/popupmenu.cpp:703 src/gui/windowmenu.cpp:123
 msgid "Spells"
 msgstr "法术"
 
@@ -2332,7 +2329,7 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
+#: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:127
 #: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "丢弃"
@@ -2397,7 +2394,7 @@ msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:122
+#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:119
 msgid "Shortcuts"
 msgstr "快捷键"
 
@@ -2406,7 +2403,7 @@ msgstr "快捷键"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: input action label
 #: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
-#: src/gui/windowmenu.cpp:167 src/input/pages/windows.cpp:36
+#: src/gui/windowmenu.cpp:164 src/input/pages/windows.cpp:36
 msgid "Windows"
 msgstr ""
 
@@ -2422,7 +2419,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:86
+#: src/gui/windowmenu.cpp:83 src/gui/windows/chatwindow.cpp:86
 msgid "Chat"
 msgstr "聊天"
 
@@ -3524,7 +3521,7 @@ msgstr ""
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action label
 #: src/gui/widgets/tabs/setup_chat.cpp:170 src/input/pages/chat.cpp:63
-#: src/input/pages/windows.cpp:210
+#: src/input/pages/windows.cpp:204
 msgid "Tabs"
 msgstr "标签"
 
@@ -3995,7 +3992,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:106
+#: src/gui/widgets/tabs/setup_other.cpp:133 src/gui/windowmenu.cpp:103
 #: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:58
 #: src/gui/windows/minimap.cpp:121
 msgid "Map"
@@ -4168,7 +4165,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: shop window name
 #. TRANSLATORS: shop button tooltip
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:135
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
 #: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
@@ -4545,9 +4542,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: relations table header
-#. TRANSLATORS: bot checker window table header
 #: src/gui/widgets/tabs/setup_relations.cpp:58
-#: src/gui/windows/botcheckerwindow.cpp:86
 msgid "Name"
 msgstr "姓名"
 
@@ -5179,163 +5174,154 @@ msgstr ""
 msgid "Quests"
 msgstr ""
 
-#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:77
-msgid "BC"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:78
-msgid "Bot checker"
-msgstr "挂机检查"
-
 #. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
 msgid "KS"
 msgstr ""
 
 #. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:81 src/gui/windows/killstats.cpp:51
+#: src/gui/windowmenu.cpp:78 src/gui/windows/killstats.cpp:51
 msgid "Kill stats"
 msgstr "杀敌统计"
 
-#: src/gui/windowmenu.cpp:83
+#: src/gui/windowmenu.cpp:80
 msgid "Smilies"
 msgstr "表情符号"
 
 #. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
 msgid "CH"
 msgstr ""
 
 #. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:90
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:94
+#: src/gui/windowmenu.cpp:91
 msgid "Status"
 msgstr "状态"
 
 #. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
 msgid "EQU"
 msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
+#: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:67
 #: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "装备"
 
 #. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:96
 msgid "INV"
 msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "物品栏"
 
 #. TRANSLATORS: short button name for cart window.
-#: src/gui/windowmenu.cpp:102
+#: src/gui/windowmenu.cpp:99
 msgid "CA"
 msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:225
 #: src/inventory.cpp:317
 msgid "Cart"
 msgstr ""
 
 #. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:105
+#: src/gui/windowmenu.cpp:102
 msgid "MAP"
 msgstr ""
 
 #. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:111
+#: src/gui/windowmenu.cpp:108
 msgid "SKI"
 msgstr "技能"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:112 src/gui/windows/skilldialog.cpp:71
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:71
 msgid "Skills"
 msgstr "技能"
 
 #. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:116
+#: src/gui/windowmenu.cpp:113
 msgid "SOC"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:118 src/gui/windows/socialwindow.cpp:56
+#: src/gui/windowmenu.cpp:115 src/gui/windows/socialwindow.cpp:56
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:120
+#: src/gui/windowmenu.cpp:117
 msgid "SH"
 msgstr ""
 
 #. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:121
 msgid "SP"
 msgstr ""
 
 #. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:125
 msgid "DR"
 msgstr ""
 
 #. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:129
 msgid "YK"
 msgstr "YK"
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:131
 msgid "Did you know"
 msgstr "你知道吗"
 
 #. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:133
 msgid "SHP"
 msgstr ""
 
 #. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:137
 msgid "OU"
 msgstr ""
 
 #. TRANSLATORS: short button name for updates window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:141
 msgid "UP"
 msgstr ""
 
 #. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:146
+#: src/gui/windowmenu.cpp:143
 msgid "Updates"
 msgstr ""
 
 #. TRANSLATORS: short button name for bank window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:145
 msgid "BA"
 msgstr ""
 
 #. TRANSLATORS: full button name
 #. TRANSLATORS: bank window name
-#: src/gui/windowmenu.cpp:150 src/gui/windows/bankwindow.cpp:43
+#: src/gui/windowmenu.cpp:147 src/gui/windows/bankwindow.cpp:43
 msgid "Bank"
 msgstr ""
 
 #. TRANSLATORS: short button name for mail window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:149
 #, fuzzy
 msgid "MA"
 msgstr "A"
@@ -5343,29 +5329,29 @@ msgstr "A"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
+#: src/gui/windowmenu.cpp:151 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
 
 #. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:156
+#: src/gui/windowmenu.cpp:153
 msgid "DBG"
 msgstr ""
 
 #. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:162
 msgid "WIN"
 msgstr ""
 
 #. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:169
+#: src/gui/windowmenu.cpp:166
 msgid "SET"
 msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:304 src/gui/windows/outfitwindow.cpp:72
+#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:72
 #: src/gui/windows/outfitwindow.cpp:568
 #, c-format
 msgid "Key: %s"
@@ -5386,22 +5372,6 @@ msgstr ""
 msgid "Deposit"
 msgstr ""
 
-#. TRANSLATORS: bot checker window header
-#: src/gui/windows/botcheckerwindow.cpp:44
-msgid "Bot Checker"
-msgstr "挂机检查"
-
-#. TRANSLATORS: bot checker window button
-#. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:53 src/gui/windows/npcdialog.cpp:117
-msgid "Reset"
-msgstr "重置"
-
-#. TRANSLATORS: bot checker window table header
-#: src/gui/windows/botcheckerwindow.cpp:94
-msgid "Result"
-msgstr "结果"
-
 #. TRANSLATORS: buy dialog name
 #: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
@@ -6269,6 +6239,11 @@ msgstr "下一个"
 msgid "Submit"
 msgstr "提交"
 
+#. TRANSLATORS: npc dialog button
+#: src/gui/windows/npcdialog.cpp:117
+msgid "Reset"
+msgstr "重置"
+
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -7929,82 +7904,77 @@ msgstr "命令的窗口"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/windows.cpp:168
-msgid "Bot Checker Window"
-msgstr "挂机检查窗口"
-
-#. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:174
 msgid "Who Is Online Window"
 msgstr "谁是在线窗口"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:180
+#: src/input/pages/windows.cpp:174
 msgid "Did you know Window"
 msgstr "你知道吗窗口"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:186
+#: src/input/pages/windows.cpp:180
 msgid "Quests Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:192
+#: src/input/pages/windows.cpp:186
 msgid "Updates Window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:198
+#: src/input/pages/windows.cpp:192
 msgid "Cart window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:204
+#: src/input/pages/windows.cpp:198
 #, fuzzy
 msgid "Quick settings window"
 msgstr "快速下拉窗口"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:216
+#: src/input/pages/windows.cpp:210
 msgid "Previous Social Tab"
 msgstr "上一页社会标签"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:222
+#: src/input/pages/windows.cpp:216
 msgid "Next Social Tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:228
+#: src/input/pages/windows.cpp:222
 msgid "Previous Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:234
+#: src/input/pages/windows.cpp:228
 msgid "Next Shortcuts tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:240
+#: src/input/pages/windows.cpp:234
 msgid "Previous Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:246
+#: src/input/pages/windows.cpp:240
 msgid "Next Commands tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:252
+#: src/input/pages/windows.cpp:246
 msgid "Previous inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:258
+#: src/input/pages/windows.cpp:252
 msgid "Next inventory tab"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/windows.cpp:264
+#: src/input/pages/windows.cpp:258
 msgid "Clear drops window"
 msgstr ""
 
@@ -9702,8 +9672,20 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"."
 
+#~ msgid "Bot checker"
+#~ msgstr "挂机检查"
+
+#~ msgid "Bot Checker"
+#~ msgstr "挂机检查"
+
+#~ msgid "Result"
+#~ msgstr "结果"
+
 #~ msgid "%s %d?"
 #~ msgstr "%s %d?"
 
 #~ msgid "Failed to send as sender or letter invalid."
 #~ msgstr "发送信件失败或者信件无效."
+
+#~ msgid "Bot Checker Window"
+#~ msgstr "挂机检查窗口"