rebuild translations.

16 files changed, 1315 insertions, 1315 deletions

diff --git a/po/cs.po b/po/cs.po
index b6d113e79..24e56fc60 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
@@ -23,12 +23,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
@@ -570,8 +570,8 @@ msgstr "Nápověda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Zavřít"
@@ -970,31 +970,31 @@ msgid "Network Error"
 msgstr "Chyba sítě"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Parta: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "PVP hodnost: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Váha: %s"
@@ -1274,7 +1274,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Výstroje"
@@ -1300,7 +1300,7 @@ msgstr "Upravit kouzlo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Vyprázdnit"
 
@@ -1424,8 +1424,8 @@ msgstr "Přidat vše do transakce"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Uložit"
 
@@ -1456,7 +1456,7 @@ msgstr "Uschovat všechny"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Vzít"
 
@@ -1489,8 +1489,8 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Použít"
 
@@ -1681,9 +1681,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Odstranit z vybavení"
 
@@ -1691,16 +1691,16 @@ msgstr "Odstranit z vybavení"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Vybavit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Upustit..."
 
@@ -1715,14 +1715,14 @@ msgstr "Upustit vše"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Upustit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Rozdělit"
 
@@ -1881,7 +1881,7 @@ msgstr "Vybrat OK"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Ukončit"
 
@@ -2470,7 +2470,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2755,7 +2755,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2834,13 +2834,13 @@ msgstr "Otevři web adresu"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Upravit"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3428,7 +3428,7 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "výchozí"
 
@@ -3675,7 +3675,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Obchod"
 
@@ -3692,7 +3692,7 @@ msgstr "Zapnout mód obchodu"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4744,8 +4744,8 @@ msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Vybavení"
 
@@ -4756,7 +4756,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventář"
@@ -4772,7 +4772,7 @@ msgid "SKI"
 msgstr "DOV"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Dovednosti"
 
@@ -4861,7 +4861,7 @@ msgstr "Ověřovač botů"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Vynulovat"
 
@@ -4882,31 +4882,31 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr "dle jména"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr "dle id"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr "dle váhy"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr "dle množství"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr "dle typu"
 
@@ -4935,7 +4935,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4947,7 +4947,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5525,7 +5525,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Připojit"
 
@@ -5860,17 +5860,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Další"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Odeslat"
 
@@ -5879,9 +5879,9 @@ msgstr "Odeslat"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Přidat"
 
@@ -5981,53 +5981,53 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Zvolte server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Načíst"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Použít stejnou IP pro herní sub servery"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Stahuji seznam serverů...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Čekám na odezvu serveru..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Připravuji stažení"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Chyba při získávání seznamu serverů!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "potřebuje novější verzi"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "potřebuje v%s"
@@ -6085,24 +6085,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s %s příjímáte?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "Zvýšit"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dovednostních bodů k dispozici: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Dovednost nastavena %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Dovednost %d"
@@ -6531,53 +6531,53 @@ msgid "Save"
 msgstr "Uložit"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Nabídnout obchod"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Potvrzeno. Čekám..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Souhlasit s obchodem"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Odsouhlaseno. Čekám..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Obchod: Ty"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "Dostaneš: %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Změnit"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Dáváš:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "Nemáte dost peněz."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Přidání věci selhalo. Nemůžeš přidat jeden druh vícekrát."
 
@@ -6664,25 +6664,25 @@ msgstr "vyber svět"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6690,7 +6690,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 5719811c9..891a8adcb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
@@ -33,12 +33,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
@@ -579,8 +579,8 @@ msgstr "Hilfe"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Schließen"
@@ -981,31 +981,31 @@ msgid "Network Error"
 msgstr "Netzwerkfehler"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Gruppe: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilde: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "PvP-Rang: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
@@ -1285,7 +1285,7 @@ msgstr "Bewege Kamera"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Ausrüstung"
@@ -1311,7 +1311,7 @@ msgstr "Bearbeite Zauberspruch"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Leeren"
 
@@ -1435,8 +1435,8 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Aufbewahren"
 
@@ -1467,7 +1467,7 @@ msgstr "Alles aufbewahren"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Abholen"
 
@@ -1500,8 +1500,8 @@ msgstr "Alles abholen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Benutzen"
 
@@ -1692,9 +1692,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -1702,16 +1702,16 @@ msgstr "Ablegen"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Wegwerfen"
 
@@ -1726,14 +1726,14 @@ msgstr "Alles fallenlassen"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Aufteilen"
 
@@ -1892,7 +1892,7 @@ msgstr "OK auswählen"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Beenden"
 
@@ -2481,7 +2481,7 @@ msgstr "Auswahl 2"
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2766,7 +2766,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2845,13 +2845,13 @@ msgstr "URL öffnen"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Ändern"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3439,7 +3439,7 @@ msgstr "SOCKS5 hostname"
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "Standard"
 
@@ -3686,7 +3686,7 @@ msgstr "Aktiviere Gewichtsbenachrichtigungen"
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Laden"
 
@@ -3703,7 +3703,7 @@ msgstr "Laden-Modus einschalten"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4760,8 +4760,8 @@ msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Ausrüstung"
 
@@ -4772,7 +4772,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventar"
@@ -4788,7 +4788,7 @@ msgid "SKI"
 msgstr "FÄH"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Fähigkeiten"
 
@@ -4877,7 +4877,7 @@ msgstr "Bot-Prüfer"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Zurücksetzten"
 
@@ -4898,31 +4898,31 @@ msgstr "nach Preis"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr "nach Name"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr "nach Id"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr "nach Gewicht"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr "nach Anzahl"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr "nach Art"
 
@@ -4951,7 +4951,7 @@ msgstr "Menge:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4963,7 +4963,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5541,7 +5541,7 @@ msgstr "Bearbeite Server"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Verbinde..."
 
@@ -5876,17 +5876,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Stoppe Warten"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Weiter"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Absenden"
 
@@ -5895,9 +5895,9 @@ msgstr "Absenden"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -5997,53 +5997,53 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wähle einen Server  ***SICHERER MODUS ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Benutze die selbe IP auf Zweitservern des Spiels"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Fehler beim Empfangen der Serverliste!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -6101,24 +6101,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s möchte %s %s akzeptierst du?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "Erhöhen"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte verfügbar: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeiten Tab %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Fähigkeit %d"
@@ -6548,53 +6548,53 @@ msgid "Save"
 msgstr "Speichern"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Handel vorschlagen"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Bestätigt. Warten..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Handel zustimmen"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Zugestimmt. Warten..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Handel: Du"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "Du bekommst %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Ändern"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Du gibst:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
@@ -6683,25 +6683,25 @@ msgstr "Wähle Welt"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "Taste_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "unbekannte Taste"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6709,7 +6709,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "U-Taste"
 
diff --git a/po/es.po b/po/es.po
index a91cde79b..1291f8bdc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
-"PO-Revision-Date: 2014-02-14 08:14+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
+"PO-Revision-Date: 2014-02-16 18:42+0000\n"
+"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
 "Language: es\n"
@@ -29,12 +29,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
@@ -575,8 +575,8 @@ msgstr "Ayuda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Cerrar"
@@ -976,31 +976,31 @@ msgid "Network Error"
 msgstr "Error de Red"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Gremio: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Rango PvP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1280,7 +1280,7 @@ msgstr "Mover cámara"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Vestimenta"
@@ -1306,7 +1306,7 @@ msgstr "Editar hechizo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -1430,8 +1430,8 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Almacenar"
 
@@ -1462,7 +1462,7 @@ msgstr "Almacenar todo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Recuperar"
 
@@ -1495,8 +1495,8 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Usar"
 
@@ -1687,9 +1687,9 @@ msgstr "Proteger artículo"
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -1697,16 +1697,16 @@ msgstr "Quitárselo"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Tirar..."
 
@@ -1721,14 +1721,14 @@ msgstr "Tirar todo"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Tirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Dividir"
 
@@ -1866,7 +1866,7 @@ msgstr "Habilitar/Deshabilitar intercambios"
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:165
 msgid "Open trade window"
-msgstr ""
+msgstr "Abrir ventana de intercambio"
 
 #. TRANSLATORS: input action name
 #: src/gui/setupactiondata.h:171
@@ -1887,7 +1887,7 @@ msgstr "Seleccionar OK"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Salir"
 
@@ -2476,7 +2476,7 @@ msgstr "Select2"
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2761,7 +2761,7 @@ msgstr "Nivel: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2840,13 +2840,13 @@ msgstr "Abrir url"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
@@ -3435,7 +3435,7 @@ msgstr "SOCKS5 hostname"
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "predeterminado"
 
@@ -3682,7 +3682,7 @@ msgstr "Habilitar notificaciones de peso"
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Tienda"
 
@@ -3699,7 +3699,7 @@ msgstr "Habilitar la tienda"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4758,8 +4758,8 @@ msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Equipamiento"
 
@@ -4770,7 +4770,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventario"
@@ -4786,7 +4786,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -4875,7 +4875,7 @@ msgstr "Inspector de Bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -4896,31 +4896,31 @@ msgstr "por precio"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr "por nombre"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr "por id"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr "por peso"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr "por cantidad"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr "por tipo"
 
@@ -4949,7 +4949,7 @@ msgstr "Cantidad:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4961,7 +4961,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5548,7 +5548,7 @@ msgstr "Editar Servidor"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Conectar"
 
@@ -5882,17 +5882,17 @@ msgid "Job level: %d"
 msgstr "Nivel de trabajo: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Dejar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Siguiente"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Enviar"
 
@@ -5901,9 +5901,9 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Añadir"
 
@@ -6005,53 +6005,53 @@ msgid "Do you really want to sell %s?"
 msgstr "¿Realmente quieres vender %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Escoge tu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Cargar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Elige tu servidor  *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Usar la misma ip para los subservidores del juego"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Descargando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "¡Error al recuperar la lista de servidores!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "requiere una versión más nueva"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -6109,24 +6109,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "Incrementar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Puntos disponibles: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidades %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidad %d"
@@ -6555,53 +6555,53 @@ msgid "Save"
 msgstr "Guardar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Proponer el intercambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Esperando..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Aceptar intercambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Aceptado. Esperando..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Intercambio: Tú"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "Tú recibes %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Cambiar"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Tú das:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "No tienes suficiente dinero."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
@@ -6690,25 +6690,25 @@ msgstr "Escoger Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "tecla desconocida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6716,7 +6716,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "tecla desc."
 
diff --git a/po/fi.po b/po/fi.po
index 1f30a4433..6c5d08894 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: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
@@ -21,12 +21,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
@@ -567,8 +567,8 @@ msgstr "Apua"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Sulje"
@@ -969,31 +969,31 @@ msgid "Network Error"
 msgstr "Verkkovirhe"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Ryhmä: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Kilta: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "Kommentti: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Paino: %s"
@@ -1273,7 +1273,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
@@ -1299,7 +1299,7 @@ msgstr "Muokkaa loitsua"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -1423,8 +1423,8 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Varastoi"
 
@@ -1455,7 +1455,7 @@ msgstr "Varastoi kaikki"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Ota"
 
@@ -1488,8 +1488,8 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Käytä"
 
@@ -1680,9 +1680,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
@@ -1690,16 +1690,16 @@ msgstr "Poista varuste käytöstä"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Ota käyttöön"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Pudota..."
 
@@ -1714,14 +1714,14 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Pudota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Jaa"
 
@@ -1880,7 +1880,7 @@ msgstr "Valitse OK"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Sulje"
 
@@ -2469,7 +2469,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2754,7 +2754,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2833,13 +2833,13 @@ msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Muokkaa"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
@@ -3427,7 +3427,7 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "oletus"
 
@@ -3674,7 +3674,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Kauppa"
 
@@ -3691,7 +3691,7 @@ msgstr "Ota kauppatila käyttöön"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
@@ -4741,8 +4741,8 @@ msgstr "Var"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Varusteet"
 
@@ -4753,7 +4753,7 @@ msgstr "Tav"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Tavarat"
@@ -4769,7 +4769,7 @@ msgid "SKI"
 msgstr "Tai"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Taidot"
 
@@ -4858,7 +4858,7 @@ msgstr "Bottitutka"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Nollaa"
 
@@ -4879,31 +4879,31 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr "nimi"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr "id"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr "paino"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr "määrä"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr "tyyppi"
 
@@ -4932,7 +4932,7 @@ msgstr "Määrä:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4944,7 +4944,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5522,7 +5522,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Yhdistä"
 
@@ -5855,17 +5855,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Lakkaa odottamasta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Seuraava"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Lähetä"
 
@@ -5874,9 +5874,9 @@ msgstr "Lähetä"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Lisää"
 
@@ -5976,53 +5976,53 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Lataa"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
@@ -6080,24 +6080,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s haluaa %s %s - hyväksytkö?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "Ylös"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "%d taitopistettä käyttämättä"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Taitojoukko %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Taito %d"
@@ -6526,53 +6526,53 @@ msgid "Save"
 msgstr "Tallenna"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Ehdota vaihtokauppaa"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Varmistettu. Odotetaan..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Hyväksy kauppa"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Hyväksytty. Odotetaan..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Kauppa: Sinä"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "Saat %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Muuta"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Annat:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
@@ -6659,25 +6659,25 @@ msgstr "Valitse pelimaailma"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6685,7 +6685,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index b51b8ba09..12ffc7a7e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 14:20+0000\n"
 "Last-Translator: Bernard <nard@bh28.net>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
@@ -29,12 +29,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
@@ -575,8 +575,8 @@ msgstr "Aide"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Fermer"
@@ -979,31 +979,31 @@ msgid "Network Error"
 msgstr "Erreur Réseau"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Groupe : %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilde : %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Rang Pvp : %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Poids : %s"
@@ -1283,7 +1283,7 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Costumes"
@@ -1309,7 +1309,7 @@ msgstr "Éditer le sortilège"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Effacer"
 
@@ -1433,8 +1433,8 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Entreposer"
 
@@ -1465,7 +1465,7 @@ msgstr "Entreposer tout"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Récupérer"
 
@@ -1498,8 +1498,8 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Utiliser"
 
@@ -1690,9 +1690,9 @@ msgstr "Objet protégé"
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -1700,16 +1700,16 @@ msgstr "Retirer"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Équiper"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Jeter..."
 
@@ -1724,14 +1724,14 @@ msgstr "Jeter tout"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Jeter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Partager"
 
@@ -1890,7 +1890,7 @@ msgstr "Sélectionner OK"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Quitter"
 
@@ -2479,7 +2479,7 @@ msgstr "Sélectionner2"
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2764,7 +2764,7 @@ msgstr "Niveau : %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2843,13 +2843,13 @@ msgstr "Ouvrir l'adresse"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Éditer"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
@@ -3437,7 +3437,7 @@ msgstr "Nom d'hôte SOCKS5"
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "défaut"
 
@@ -3684,7 +3684,7 @@ msgstr "Activer les notifications de poids"
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Boutique"
 
@@ -3701,7 +3701,7 @@ msgstr "Activer le mode boutique"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "PNJ"
@@ -4764,8 +4764,8 @@ msgstr "Equ"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Équipement"
 
@@ -4776,7 +4776,7 @@ msgstr "Inv"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventaire"
@@ -4792,7 +4792,7 @@ msgid "SKI"
 msgstr "Cmp"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Compétences"
 
@@ -4881,7 +4881,7 @@ msgstr "Testeur de Robot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -4902,31 +4902,31 @@ msgstr "par prix"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr "par nom"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr "par numéro d'identification"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr "par poids"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr "par nombre"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr "par type"
 
@@ -4955,7 +4955,7 @@ msgstr "Montant :"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4967,7 +4967,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5550,7 +5550,7 @@ msgstr "Éditer le Serveur"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Connexion..."
 
@@ -5883,17 +5883,17 @@ msgid "Job level: %d"
 msgstr "Niveau de métier : %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Arrêter d'attendre "
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Suivant"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -5902,9 +5902,9 @@ msgstr "Soumettre"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Ajouter"
 
@@ -6004,53 +6004,53 @@ msgid "Do you really want to sell %s?"
 msgstr "Veux-tu vraiment vendre %s ?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Choisis le serveur"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Charger"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Choisis ton serveur  *** Mode Sûr ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveurs !"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -6108,24 +6108,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s souhaite %s %s Acceptez-vous ?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "Augmenter"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Compétence choisie : %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Compétence %d"
@@ -6558,53 +6558,53 @@ msgid "Save"
 msgstr "Sauvegarder"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Proposer un troc"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Confirmé. En attente..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Accepter l'échange"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Accepté. En attente..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Échange : Toi"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "Vous recevez %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Changer"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Vous donnez :"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "Bous n'avez pas assez d'argent."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez pas ajouter deux fois le même "
@@ -6693,25 +6693,25 @@ msgstr "Choix du monde"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "touche_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "JBoutton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "touche inconnue"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6719,7 +6719,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "touche u"
 
diff --git a/po/id.po b/po/id.po
index b44fc85db..c2f092baa 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
@@ -22,12 +22,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
@@ -567,8 +567,8 @@ msgstr "Bantuan"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Tutup"
@@ -968,31 +968,31 @@ msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Kelompok: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Organisasi: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Berat: %s"
@@ -1272,7 +1272,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Setelan"
@@ -1298,7 +1298,7 @@ msgstr "Edit mantra"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Hapus"
 
@@ -1422,8 +1422,8 @@ msgstr "Tambahkan semua ke Penukaran"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Simpan"
 
@@ -1454,7 +1454,7 @@ msgstr "Masukkan semua"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Kembalikan"
 
@@ -1487,8 +1487,8 @@ msgstr "Ambil semua"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Gunakan"
 
@@ -1679,9 +1679,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Lepaskan"
 
@@ -1689,16 +1689,16 @@ msgstr "Lepaskan"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Pakai"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Buang..."
 
@@ -1713,14 +1713,14 @@ msgstr "Buang semuanya"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Buang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Pecah"
 
@@ -1879,7 +1879,7 @@ msgstr ""
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Keluar"
 
@@ -2468,7 +2468,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2753,7 +2753,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2832,13 +2832,13 @@ msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Ganti"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
@@ -3424,7 +3424,7 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "kembalikan ke semula"
 
@@ -3671,7 +3671,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Toko"
 
@@ -3688,7 +3688,7 @@ msgstr "Perbolehkan mode Jual"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4737,8 +4737,8 @@ msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Perlengkapan"
 
@@ -4749,7 +4749,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Perbekalan"
@@ -4765,7 +4765,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Keahlian"
 
@@ -4854,7 +4854,7 @@ msgstr "Pengecek Bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reset"
 
@@ -4875,31 +4875,31 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr ""
 
@@ -4928,7 +4928,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4940,7 +4940,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5518,7 +5518,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Menyambung"
 
@@ -5849,17 +5849,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Berikutnya"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Masukan"
 
@@ -5868,9 +5868,9 @@ msgstr "Masukan"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Tambah"
 
@@ -5970,53 +5970,53 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Pilih Server Anda"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Memuat"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Pilih Servermu *** SAFE MODE ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Gunakan ip yang sama untuk sub server game"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Mengunduh daftar server... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Menyambung ke server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Menyiapkan pengunduhan"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "Membutuhkan versi terbaru"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
@@ -6074,24 +6074,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s ingin %s %s apakah anda bersedia?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "Naik"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "poin Skill yang tersedia: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
@@ -6520,53 +6520,53 @@ msgid "Save"
 msgstr "Simpan"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Menawarkan tukar menukar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Dikonfirmasi. Menunggu..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Terima penukaran"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Terima. Menunggu..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Tukar: Anda"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "Kamu mendapatkan %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Ubah"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Anda memberikan:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "Anda tidak memiliki cukup uang."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -6653,25 +6653,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6679,7 +6679,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index d0b94f991..c9e525348 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
@@ -26,12 +26,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
@@ -572,8 +572,8 @@ msgstr "Aiuto"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Chiudi"
@@ -974,31 +974,31 @@ msgid "Network Error"
 msgstr "Errore di rete"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Party: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1278,7 +1278,7 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Attrezzatura"
@@ -1304,7 +1304,7 @@ msgstr "Modifica Incantesimo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Cancella"
 
@@ -1428,8 +1428,8 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Magazzino"
 
@@ -1460,7 +1460,7 @@ msgstr "Salva tutto"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Recupera"
 
@@ -1493,8 +1493,8 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Usa"
 
@@ -1685,9 +1685,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Togli"
 
@@ -1695,16 +1695,16 @@ msgstr "Togli"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equipaggia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Lascia..."
 
@@ -1719,14 +1719,14 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Lascia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Dividi"
 
@@ -1885,7 +1885,7 @@ msgstr "Seleziona OK"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Esci"
 
@@ -2474,7 +2474,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2759,7 +2759,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2838,13 +2838,13 @@ msgstr "Apri url"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Modifica"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3432,7 +3432,7 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "Predefinito"
 
@@ -3679,7 +3679,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Negozio"
 
@@ -3696,7 +3696,7 @@ msgstr "Abilita la modalità negozio"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4751,8 +4751,8 @@ msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
@@ -4763,7 +4763,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventario"
@@ -4779,7 +4779,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Abilità"
 
@@ -4868,7 +4868,7 @@ msgstr "Bot Checker"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reimposta"
 
@@ -4889,31 +4889,31 @@ msgstr "per prezzo"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr "per nome"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr "per ID"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr "per peso"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr "per quantita'"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr "per tipo"
 
@@ -4942,7 +4942,7 @@ msgstr "Quantita':"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4954,7 +4954,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5532,7 +5532,7 @@ msgstr "Modifica Server"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Connetti"
 
@@ -5865,17 +5865,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Ferma attesa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Prossimo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Invia"
 
@@ -5884,9 +5884,9 @@ msgstr "Invia"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -5986,53 +5986,53 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Scegli il tuo server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Carica"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Scegli Il Tuo Server  *** MODALITA' SICURA ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Utilizzare lo stesso IP per i sub server di gioco"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloading server list... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Attesa del server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Preparazione download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Errore nel ricevimento della lista sei server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "Richiede una versione più nuova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "Richiede v%s"
@@ -6090,24 +6090,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s vuole %s %s accetti?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "Su"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punti abilità disponibili: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Abilità impostata %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Abilità %d"
@@ -6536,53 +6536,53 @@ msgid "Save"
 msgstr "Salva"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Inizia uno scambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Confermato. In attesa..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Accetta scambio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Accettato. In attesa..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Commercia: Tu"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "Ottieni %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Cambia"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Dai:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "Non hai abbastanza denaro."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
@@ -6671,25 +6671,25 @@ msgstr "Scegli parola"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "pulsante sconosciuto"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6697,7 +6697,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 5f5abeb67..7e8063fc2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
@@ -25,12 +25,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "トレードリクエストを無効にしています"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
@@ -570,8 +570,8 @@ msgstr "ヘルプ"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "閉じる"
@@ -971,31 +971,31 @@ msgid "Network Error"
 msgstr "ネットワークエラー"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "パーティ: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "ギルド: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "コメント: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "重力: %s"
@@ -1275,7 +1275,7 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "服装"
@@ -1301,7 +1301,7 @@ msgstr "呪文を編集する"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "クリア"
 
@@ -1425,8 +1425,8 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "保管"
 
@@ -1457,7 +1457,7 @@ msgstr "全部保存"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "取出す"
 
@@ -1490,8 +1490,8 @@ msgstr "全部取出す"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "使用"
 
@@ -1682,9 +1682,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "取外す"
 
@@ -1692,16 +1692,16 @@ msgstr "取外す"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "装着"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "落とす..."
 
@@ -1716,14 +1716,14 @@ msgstr "全て落とす"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "分割"
 
@@ -1882,7 +1882,7 @@ msgstr "OKを選択する"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "終了"
 
@@ -2471,7 +2471,7 @@ msgstr "選択2"
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2756,7 +2756,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2835,13 +2835,13 @@ msgstr "URLを開く"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "編集"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3429,7 +3429,7 @@ msgstr "SOCKS5 ホスト名"
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "デフォルト"
 
@@ -3676,7 +3676,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "店"
 
@@ -3693,7 +3693,7 @@ msgstr "ショップモードを有効にする"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4742,8 +4742,8 @@ msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "装着品"
 
@@ -4754,7 +4754,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "インベントリー"
@@ -4770,7 +4770,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "スキル"
 
@@ -4859,7 +4859,7 @@ msgstr "ボットチェッカー"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "リセット"
 
@@ -4880,31 +4880,31 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr "名前"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr "ID"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr "重量"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr "数量"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr "タイプ"
 
@@ -4933,7 +4933,7 @@ msgstr "量:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4945,7 +4945,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5523,7 +5523,7 @@ msgstr "サーバー編集"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "接続"
 
@@ -5854,17 +5854,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "キャンセル"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "次"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "決定"
 
@@ -5873,9 +5873,9 @@ msgstr "決定"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "追加"
 
@@ -5975,53 +5975,53 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "サーバーを選択してください"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "読込み"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "サーバーを選んで下さい  *** セーフモード ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "同じIPをゲームサブサーバーでも使用する"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "サーバーリストをダウンロード中...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "サーバーからの応答を待っています"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "ダウンロード準備中..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "サーバーリストの読み込みに失敗"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "アップデートが必要です"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "v%sが必要"
@@ -6079,24 +6079,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%sが%s %sを希望しています。承認しますか？"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "上"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
@@ -6525,53 +6525,53 @@ msgid "Save"
 msgstr "セーブ"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "トレードを申請する"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "確認中"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "トレードを了承する"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "了承しました"
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "トレード:自分"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "%sを手に入れた"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "変更"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "トレードするアイテム:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "GP不足です"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
@@ -6660,25 +6660,25 @@ msgstr "世界の選択"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "キー_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "ジョイスティックボタン%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "不明なキー"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6686,7 +6686,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u キー"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 7958901a5..34764078f 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: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+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"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -565,8 +565,8 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr ""
@@ -963,31 +963,31 @@ msgid "Network Error"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1267,7 +1267,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr ""
@@ -1293,7 +1293,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr ""
 
@@ -1417,8 +1417,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr ""
 
@@ -1449,7 +1449,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr ""
 
@@ -1482,8 +1482,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr ""
 
@@ -1674,9 +1674,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr ""
 
@@ -1684,16 +1684,16 @@ msgstr ""
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr ""
 
@@ -1708,14 +1708,14 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr ""
 
@@ -1874,7 +1874,7 @@ msgstr ""
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr ""
 
@@ -2463,7 +2463,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2748,7 +2748,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2827,13 +2827,13 @@ msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3419,7 +3419,7 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr ""
 
@@ -3666,7 +3666,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr ""
 
@@ -3683,7 +3683,7 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr ""
@@ -4732,8 +4732,8 @@ msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr ""
 
@@ -4744,7 +4744,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr ""
@@ -4760,7 +4760,7 @@ msgid "SKI"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr ""
 
@@ -4849,7 +4849,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -4870,31 +4870,31 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr ""
 
@@ -4923,7 +4923,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr ""
@@ -4935,7 +4935,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr ""
@@ -5513,7 +5513,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr ""
 
@@ -5846,17 +5846,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr ""
 
@@ -5865,9 +5865,9 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
@@ -5967,53 +5967,53 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -6071,24 +6071,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr ""
@@ -6517,53 +6517,53 @@ msgid "Save"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr ""
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr ""
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr ""
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -6650,25 +6650,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6676,7 +6676,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index b865fbf99..6684a77b3 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -22,12 +22,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
@@ -568,8 +568,8 @@ msgstr "Help"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Sluiten"
@@ -969,31 +969,31 @@ msgid "Network Error"
 msgstr "Netwerkfout"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Groep: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilde: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
@@ -1273,7 +1273,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Kleren"
@@ -1299,7 +1299,7 @@ msgstr "Wijzig spreuk"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Wissen"
 
@@ -1423,8 +1423,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Opslaan"
 
@@ -1455,7 +1455,7 @@ msgstr "Plaats alles"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Afhalen"
 
@@ -1488,8 +1488,8 @@ msgstr "Haal alles op"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -1680,9 +1680,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -1690,16 +1690,16 @@ msgstr "Afdoen"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Neerleggen..."
 
@@ -1714,14 +1714,14 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Splitsen"
 
@@ -1880,7 +1880,7 @@ msgstr "OK selecteren"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -2469,7 +2469,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2754,7 +2754,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2833,13 +2833,13 @@ msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Wijzig"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
@@ -3425,7 +3425,7 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "standaard"
 
@@ -3672,7 +3672,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Winkel"
 
@@ -3689,7 +3689,7 @@ msgstr "shop modus aanzetten"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4744,8 +4744,8 @@ msgstr "UITR"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -4756,7 +4756,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventaris"
@@ -4772,7 +4772,7 @@ msgid "SKI"
 msgstr "VAAR"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -4861,7 +4861,7 @@ msgstr "Bot Controleerder"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reset"
 
@@ -4882,31 +4882,31 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr ""
 
@@ -4935,7 +4935,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4947,7 +4947,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5525,7 +5525,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -5858,17 +5858,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Indienen"
 
@@ -5877,9 +5877,9 @@ msgstr "Indienen"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -5979,53 +5979,53 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Gebruik hetzelfde ip voor spel sub-servers"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -6083,24 +6083,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s wilt %s %s ga je akkoord?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
@@ -6529,53 +6529,53 @@ msgid "Save"
 msgstr "Bewaren"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Handelen voorstellen"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Bevestigd. Wachten..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Handel goedkeuren"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Goedgekeurd. Wachten..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Handel: Jij"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "U krijgt %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Veranderen"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
@@ -6664,25 +6664,25 @@ msgstr "Kies Wereld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6690,7 +6690,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u key"
 
diff --git a/po/pl.po b/po/pl.po
index 02dd6912f..0ce908804 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:14+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
@@ -25,12 +25,12 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
@@ -572,8 +572,8 @@ msgstr "Pomoc"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Zamknij"
@@ -971,31 +971,31 @@ msgid "Network Error"
 msgstr "Błąd sieci"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Grupa: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Gildia: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Miejsce w PvP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Waga: %s"
@@ -1275,7 +1275,7 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Stroje"
@@ -1301,7 +1301,7 @@ msgstr "Edytuj zaklęcie"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Wyczyść"
 
@@ -1425,8 +1425,8 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Przechowaj"
 
@@ -1457,7 +1457,7 @@ msgstr "Przechowaj wszystko"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Pobierz"
 
@@ -1490,8 +1490,8 @@ msgstr "Odbierz wszystko"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Użyj"
 
@@ -1682,9 +1682,9 @@ msgstr "Chroń przedmiot"
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Zdejmij"
 
@@ -1692,16 +1692,16 @@ msgstr "Zdejmij"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Załóż"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Upuść..."
 
@@ -1716,14 +1716,14 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Upuść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Podziel"
 
@@ -1882,7 +1882,7 @@ msgstr "Wybrano OK"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Wyjdź"
 
@@ -2471,7 +2471,7 @@ msgstr "Wybierz2"
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2756,7 +2756,7 @@ msgstr "Poziom: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2835,13 +2835,13 @@ msgstr "Otwórz adres url"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Edycja"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
@@ -3429,7 +3429,7 @@ msgstr "Nazwa hosta SOCKS5"
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "domyślnie"
 
@@ -3676,7 +3676,7 @@ msgstr "Aktywuj powiadomienia dotyczące wagi."
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Sklep"
 
@@ -3693,7 +3693,7 @@ msgstr "Włącz tryb sklepu"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4747,8 +4747,8 @@ msgstr "EKW"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Ekwipunek"
 
@@ -4759,7 +4759,7 @@ msgstr "INW"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inwentarz"
@@ -4775,7 +4775,7 @@ msgid "SKI"
 msgstr "SKI"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Zdolności"
 
@@ -4864,7 +4864,7 @@ msgstr "Wykrywacz botów"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Resetuj"
 
@@ -4885,31 +4885,31 @@ msgstr "po cenie"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr "wg. nazwy"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr "wg. ID"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr "wg. wagi"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr "wg. ilości"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr "wg. typu"
 
@@ -4938,7 +4938,7 @@ msgstr "Ilość:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4950,7 +4950,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5533,7 +5533,7 @@ msgstr "Edytuj serwer"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Połącz"
 
@@ -5868,17 +5868,17 @@ msgid "Job level: %d"
 msgstr "Poziom Pracy: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Przerwij"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Dalej"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Zatwierdź"
 
@@ -5887,9 +5887,9 @@ msgstr "Zatwierdź"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Dodaj"
 
@@ -5989,53 +5989,53 @@ msgid "Do you really want to sell %s?"
 msgstr "Czy naprawdę chcesz sprzedać %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Wybierz serwer"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Załaduj"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Użyj tego samego IP dla podserwerów"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Ściąganie listy serwerów... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Czekanie na serwer..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Przygotowanie ściągania"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Błąd przy uzyskiwaniu listy serwerów!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "wymaga nowszej wersji"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "wymaga v%s"
@@ -6093,24 +6093,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s%s, akceptujesz?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "Podwyż"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dostępne punkty umiejętności: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Zestaw umiejętności %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Umiejętność %d"
@@ -6539,53 +6539,53 @@ msgid "Save"
 msgstr "Zachowaj"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Oferuj handel"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Potwierdzono. Oczekiwanie..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Akceptuj handel"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Zaakceptowano. Oczekiwanie..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Handel: Ty"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "Otrzymujesz %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Zmień"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Dajesz:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
@@ -6674,25 +6674,25 @@ msgstr "Wybierz świat"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "nieznany klawisz"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6700,7 +6700,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "(nieznany)"
 
diff --git a/po/pt.po b/po/pt.po
index e6755bbca..d45796b51 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: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
@@ -23,12 +23,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
@@ -569,8 +569,8 @@ msgstr "Ajuda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Fechar"
@@ -970,31 +970,31 @@ msgid "Network Error"
 msgstr "Erro de conexão"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Posição no PVP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1274,7 +1274,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Roupas"
@@ -1300,7 +1300,7 @@ msgstr "Editar Feitiços"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1424,8 +1424,8 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Armazenar"
 
@@ -1456,7 +1456,7 @@ msgstr "Guardar tudo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Retirar"
 
@@ -1489,8 +1489,8 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Usar"
 
@@ -1681,9 +1681,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -1691,16 +1691,16 @@ msgstr "Desequipar"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Descartar..."
 
@@ -1715,14 +1715,14 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Dividir"
 
@@ -1881,7 +1881,7 @@ msgstr "Selecionar OK"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Sair"
 
@@ -2470,7 +2470,7 @@ msgstr "Selecionar2"
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2755,7 +2755,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2834,13 +2834,13 @@ msgstr "Abrir URL"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -3428,7 +3428,7 @@ msgstr "SOCK5 hostname"
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "padrão"
 
@@ -3675,7 +3675,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Loja"
 
@@ -3692,7 +3692,7 @@ msgstr "Habilitar modo loja"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4745,8 +4745,8 @@ msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -4757,7 +4757,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventário"
@@ -4773,7 +4773,7 @@ msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -4862,7 +4862,7 @@ msgstr "Analizador de bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Resetar"
 
@@ -4883,31 +4883,31 @@ msgstr "por preço"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr "por nome"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr "por id"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr "por peso"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr "por quantidade"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr "por tipo"
 
@@ -4936,7 +4936,7 @@ msgstr "Quantidade:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4948,7 +4948,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5531,7 +5531,7 @@ msgstr "Editar Servidor"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Conectar"
 
@@ -5864,17 +5864,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Aguarde..."
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Enviar"
 
@@ -5883,9 +5883,9 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Adicionar"
 
@@ -5985,53 +5985,53 @@ msgid "Do you really want to sell %s?"
 msgstr "Você realmente deseja vender %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -6089,24 +6089,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
@@ -6535,53 +6535,53 @@ msgid "Save"
 msgstr "Salvar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Propor negócio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Aguardando..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Aceitar negociação"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Aceitou. Aguarde..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Negócio: você"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Mudar"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
@@ -6669,25 +6669,25 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "JBotão%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6695,7 +6695,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "Tecla u"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9910bdf02..a8a600e39 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -29,12 +29,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
@@ -575,8 +575,8 @@ msgstr "Ajuda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Fechar"
@@ -976,31 +976,31 @@ msgid "Network Error"
 msgstr "Erro de conexão"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Posição no PVP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
@@ -1280,7 +1280,7 @@ msgstr "Mover câmera "
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Roupas"
@@ -1306,7 +1306,7 @@ msgstr "Editar feitiços"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1430,8 +1430,8 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Armazenar"
 
@@ -1462,7 +1462,7 @@ msgstr "Guardar tudo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Retirar"
 
@@ -1495,8 +1495,8 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Usar"
 
@@ -1687,9 +1687,9 @@ msgstr "Proteger item"
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -1697,16 +1697,16 @@ msgstr "Desequipar"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Descartar..."
 
@@ -1721,14 +1721,14 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Dividir"
 
@@ -1887,7 +1887,7 @@ msgstr "Selecionar OK"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Sair"
 
@@ -2476,7 +2476,7 @@ msgstr "Selecionar2"
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2761,7 +2761,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2840,13 +2840,13 @@ msgstr "Abrir URL"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -3434,7 +3434,7 @@ msgstr "SOCK5 hostname"
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "padrão"
 
@@ -3681,7 +3681,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Loja"
 
@@ -3698,7 +3698,7 @@ msgstr "Habilitar modo loja"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4752,8 +4752,8 @@ msgstr "EQU"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -4764,7 +4764,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Inventário"
@@ -4780,7 +4780,7 @@ msgid "SKI"
 msgstr "HAB"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -4869,7 +4869,7 @@ msgstr "Analizador de bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Resetar"
 
@@ -4890,31 +4890,31 @@ msgstr "por preço"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr "por nome"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr "por id"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr "por peso"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr "por quantidade"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr "por tipo"
 
@@ -4943,7 +4943,7 @@ msgstr "Quantidade:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4955,7 +4955,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5538,7 +5538,7 @@ msgstr "Editar Servidor"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Conectar"
 
@@ -5871,17 +5871,17 @@ msgid "Job level: %d"
 msgstr "Nível Job: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Parar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Enviar"
 
@@ -5890,9 +5890,9 @@ msgstr "Enviar"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Adicionar"
 
@@ -5992,53 +5992,53 @@ msgid "Do you really want to sell %s?"
 msgstr "Você realmente quer vender: %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -6096,24 +6096,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
@@ -6542,53 +6542,53 @@ msgid "Save"
 msgstr "Salvar"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Propor negócio"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Aguardando..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Aceitar negociação"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Aceitou. Aguarde..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Negócio: você"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Mudar"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
@@ -6676,25 +6676,25 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "BotãoJ%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6702,7 +6702,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "tecla u"
 
diff --git a/po/ru.po b/po/ru.po
index c5f542213..aaf73c16e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 09:12+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
@@ -28,12 +28,12 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
@@ -575,8 +575,8 @@ msgstr "Помощь"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Закрыть"
@@ -977,31 +977,31 @@ msgid "Network Error"
 msgstr "Ошибка сети"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Группа: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Гильдия: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "PvP ранг: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Вес: %s"
@@ -1281,7 +1281,7 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Наряды"
@@ -1307,7 +1307,7 @@ msgstr "Изменить заклинание"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Очистить"
 
@@ -1431,8 +1431,8 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Сохранить"
 
@@ -1463,7 +1463,7 @@ msgstr "Сохранить все"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Получить"
 
@@ -1496,8 +1496,8 @@ msgstr "Получить все"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Использовать"
 
@@ -1688,9 +1688,9 @@ msgstr "Поставить защиту"
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Снять"
 
@@ -1698,16 +1698,16 @@ msgstr "Снять"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Надеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Бросить..."
 
@@ -1722,14 +1722,14 @@ msgstr "Бросить все"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Бросить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Разделить"
 
@@ -1888,7 +1888,7 @@ msgstr "Выбор OK"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Выход"
 
@@ -2477,7 +2477,7 @@ msgstr "Выбор2"
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2762,7 +2762,7 @@ msgstr "Уровень: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2841,13 +2841,13 @@ msgstr "Открыть ссылку"
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Изменить"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
@@ -3435,7 +3435,7 @@ msgstr "SOCKS5 хост"
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "По умолчанию"
 
@@ -3682,7 +3682,7 @@ msgstr "Включить напоминание о весе"
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Магазин"
 
@@ -3699,7 +3699,7 @@ msgstr "Включить режим магазина"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4760,8 +4760,8 @@ msgstr "СН"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Снаряжение"
 
@@ -4772,7 +4772,7 @@ msgstr "ИНВ"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Инвентарь"
@@ -4788,7 +4788,7 @@ msgid "SKI"
 msgstr "УМ"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Умения"
 
@@ -4877,7 +4877,7 @@ msgstr "Окно детектора ботов"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -4898,31 +4898,31 @@ msgstr "по цене"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr "по названию"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr "по ID"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr "по весу"
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr "по кол-ву."
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr "по типу"
 
@@ -4951,7 +4951,7 @@ msgstr "Количество:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4963,7 +4963,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5546,7 +5546,7 @@ msgstr "Редактирование сервера"
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Соединиться"
 
@@ -5881,17 +5881,17 @@ msgid "Job level: %d"
 msgstr "Уровень профессии: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr "Остановить ожидание"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "Следующий"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Применить"
 
@@ -5900,9 +5900,9 @@ msgstr "Применить"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Добавить"
 
@@ -6002,53 +6002,53 @@ msgid "Do you really want to sell %s?"
 msgstr "Вы действительно хотите продать %s?"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Загрузить"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -6106,24 +6106,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s хочет %s %s, вы принимаете предложение?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "Верх"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Умение %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Умение %d"
@@ -6552,53 +6552,53 @@ msgid "Save"
 msgstr "Сохранить"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Предложить торговлю"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Подтверждено. Ждем-с..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Подтвердить торговлю"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Подтверждено. Ждем-с..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Торговля: Вы"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "Вы получаете %s."
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Сменить"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Вы отдаете:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "У вас недостаточно денег"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
@@ -6687,25 +6687,25 @@ msgstr "Выберите сервер"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "кнопка_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr "КнопДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr "неизвестная кнопка"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -6713,7 +6713,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "неиз."
 
diff --git a/po/tr.po b/po/tr.po
index b75360b5c..80608a1fc 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: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
@@ -22,12 +22,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "Gelen takas istekleri görmezden geliniyor."
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
@@ -568,8 +568,8 @@ msgstr "Yardım"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "Kapat"
@@ -969,31 +969,31 @@ msgid "Network Error"
 msgstr "Ağ Hatası"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "Grup: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "Lonca: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "Ağırlık: %s"
@@ -1273,7 +1273,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "Kıyafetler"
@@ -1299,7 +1299,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "Temizle"
 
@@ -1423,8 +1423,8 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "Sakla"
 
@@ -1455,7 +1455,7 @@ msgstr "Tamamını sakla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "Almak"
 
@@ -1488,8 +1488,8 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "Kullan"
 
@@ -1680,9 +1680,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "Çıkar"
 
@@ -1690,16 +1690,16 @@ msgstr "Çıkar"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "Donatmak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "Bırak..."
 
@@ -1714,14 +1714,14 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "Bırak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "Bölme"
 
@@ -1880,7 +1880,7 @@ msgstr "Seçim Tamam"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "Çıkış"
 
@@ -2469,7 +2469,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2754,7 +2754,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2833,13 +2833,13 @@ msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "Dünzenle"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
@@ -3428,7 +3428,7 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "varsayılan"
 
@@ -3675,7 +3675,7 @@ msgstr "Ağırlık bildirimlerini etkinleştir"
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "Mağaza"
 
@@ -3692,7 +3692,7 @@ msgstr "Mağaza modunu etkinleştir"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4741,8 +4741,8 @@ msgstr "EKP"
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "Ekipman"
 
@@ -4753,7 +4753,7 @@ msgstr "ENV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "Envanter"
@@ -4769,7 +4769,7 @@ msgid "SKI"
 msgstr "YTN"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "Yetenekler"
 
@@ -4858,7 +4858,7 @@ msgstr "Bot Kontrolörü"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Sıfırla"
 
@@ -4879,31 +4879,31 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr ""
 
@@ -4932,7 +4932,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4944,7 +4944,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5522,7 +5522,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "Bağlan"
 
@@ -5855,17 +5855,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "İleri"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "Onayla"
 
@@ -5874,9 +5874,9 @@ msgstr "Onayla"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "Ekle"
 
@@ -5976,53 +5976,53 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "Sunucunu Seç"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "Yükle"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "Alt oyun sunucuları için aynı IP' yi kullan"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Sunucu listesi indiriliyor...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "Sunucu bekleniyor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "İndirmeye hazırlanılıyor"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "Sunucu listesi alma hatası!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "daha yeni bir sürüm gerektirir"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "v%s gerektirir"
@@ -6080,24 +6080,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s sizden %s %s istiyor, kabul ediyor musunuz?"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "Yukarı"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Mevcut yetenek puanları: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr "Yetenek Seti %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "Yetenek %d"
@@ -6526,53 +6526,53 @@ msgid "Save"
 msgstr "Kayıt"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "Takas teklif et"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "Doğrulandı. Bekleniyor..."
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "Takası kabul et"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "Kabul edildi. Bekleniyor..."
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "Takas: Sen"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "%s alıyorsun"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "Değiştir"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "Verdiğin:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "Yeterli paran yok."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Nesne eklemesi başarısız oldu. Pencerede aynı tür nesneyi üst üste "
@@ -6661,25 +6661,25 @@ msgstr "Dünya Seç"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6687,7 +6687,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0b0badffa..c789b0cdd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-16 15:26+0300\n"
+"POT-Creation-Date: 2014-02-16 22:19+0300\n"
 "PO-Revision-Date: 2014-02-14 08:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -24,12 +24,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:875
+#: src/actionmanager.cpp:876
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:885
+#: src/actionmanager.cpp:886
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
@@ -569,8 +569,8 @@ msgstr "帮助"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
 #: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:259 src/gui/windows/npcdialog.cpp:71
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
+#: src/gui/windows/inventorywindow.cpp:257 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:136
 #: src/gui/windows/shopwindow.cpp:77
 msgid "Close"
 msgstr "关闭"
@@ -967,31 +967,31 @@ msgid "Network Error"
 msgstr "网络错误"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:131
 #, c-format
 msgid "Party: %s"
 msgstr "团队:%s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:146
 #, c-format
 msgid "Guild: %s"
 msgstr "工会:%s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:160
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:172
 #, c-format
 msgid "Comment: %s"
 msgstr "评论: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:196
+#: src/gui/popups/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "重量：%s"
@@ -1271,7 +1271,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:53
 msgid "Outfits"
 msgstr "套装"
@@ -1297,7 +1297,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:104
 msgid "Clear"
 msgstr "清除"
 
@@ -1421,8 +1421,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
-#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:255
-#: src/gui/windows/inventorywindow.cpp:777 src/gui/windows/setupwindow.cpp:95
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:253
+#: src/gui/windows/inventorywindow.cpp:775 src/gui/windows/setupwindow.cpp:95
 msgid "Store"
 msgstr "存储"
 
@@ -1453,7 +1453,7 @@ msgstr "商店所有"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:255
 msgid "Retrieve"
 msgstr "取回"
 
@@ -1486,8 +1486,8 @@ msgstr "检索所有"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
 #: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
-#: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:688 src/gui/windows/skilldialog.cpp:288
+#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:686 src/gui/windows/skilldialog.cpp:287
 msgid "Use"
 msgstr "使用"
 
@@ -1678,9 +1678,9 @@ msgstr ""
 #. TRANSLATORS: unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:208
-#: src/gui/windows/inventorywindow.cpp:677
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:675
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -1688,16 +1688,16 @@ msgstr "卸下装备"
 #. TRANSLATORS: use item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:204
-#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:202
+#: src/gui/windows/inventorywindow.cpp:680 src/gui/windows/outfitwindow.cpp:60
 msgid "Equip"
 msgstr "装备"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:785
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:783
 msgid "Drop..."
 msgstr "掉落... ..."
 
@@ -1712,14 +1712,14 @@ msgstr "所有"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:790
+#: src/gui/windows/inventorywindow.cpp:788
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:223
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:221
 msgid "Split"
 msgstr "分离"
 
@@ -1878,7 +1878,7 @@ msgstr "选择OK"
 #: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:275
 #: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
 #: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:109
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:252
 msgid "Quit"
 msgstr "退出"
 
@@ -2467,7 +2467,7 @@ msgstr ""
 #. TRANSLATORS: command editor button
 #: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:259
 #: src/gui/windows/charselectdialog.cpp:107
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
+#: src/gui/windows/serverdialog.cpp:260 src/gui/windows/shopwindow.cpp:93
 #: src/gui/windows/shopwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:205
 msgid "Delete"
@@ -2752,7 +2752,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:601
+#: src/gui/windows/inventorywindow.cpp:599
 #: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
 #: src/gui/windows/statuswindow.cpp:365
 #, c-format
@@ -2831,13 +2831,13 @@ msgstr ""
 
 #. TRANSLATORS: setup item button
 #. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/widgets/setupitem.cpp:361 src/gui/widgets/setupitem.cpp:497
+#: src/gui/windows/serverdialog.cpp:258
 msgid "Edit"
 msgstr "编辑"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:593
+#: src/gui/widgets/skillinfo.cpp:89 src/gui/windows/skilldialog.cpp:592
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
@@ -3423,7 +3423,7 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
 #: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:152
-#: src/gui/windows/inventorywindow.cpp:70
+#: src/gui/windows/inventorywindow.cpp:68
 msgid "default"
 msgstr "默认"
 
@@ -3670,7 +3670,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:255 src/gui/windowmenu.cpp:144
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "Shop"
 msgstr "商店"
 
@@ -3687,7 +3687,7 @@ msgstr "启用商店模式"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
-#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:82
+#: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windows/npcdialog.cpp:80
 #: src/gui/windows/npcpostdialog.cpp:44
 msgid "NPC"
 msgstr "NPC"
@@ -4736,8 +4736,8 @@ msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Equipment"
 msgstr "装备"
 
@@ -4748,7 +4748,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:162
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:160
 #: src/inventory.cpp:257
 msgid "Inventory"
 msgstr "物品栏"
@@ -4764,7 +4764,7 @@ msgid "SKI"
 msgstr "技能"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:281
+#: src/gui/windowmenu.cpp:109 src/gui/windows/skilldialog.cpp:280
 msgid "Skills"
 msgstr "技能"
 
@@ -4853,7 +4853,7 @@ msgstr "挂机检查"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:113
+#: src/gui/windows/botcheckerwindow.cpp:271 src/gui/windows/npcdialog.cpp:111
 msgid "Reset"
 msgstr "重置"
 
@@ -4874,31 +4874,31 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:72
+#: src/gui/windows/buydialog.cpp:61 src/gui/windows/inventorywindow.cpp:70
 msgid "by name"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:74
+#: src/gui/windows/buydialog.cpp:63 src/gui/windows/inventorywindow.cpp:72
 msgid "by id"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:76
+#: src/gui/windows/buydialog.cpp:65 src/gui/windows/inventorywindow.cpp:74
 msgid "by weight"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:78
+#: src/gui/windows/buydialog.cpp:67 src/gui/windows/inventorywindow.cpp:76
 msgid "by amount"
 msgstr ""
 
 #. TRANSLATORS: buy dialog sort type.
 #. TRANSLATORS: inventory sort mode
-#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:80
+#: src/gui/windows/buydialog.cpp:69 src/gui/windows/inventorywindow.cpp:78
 msgid "by type"
 msgstr ""
 
@@ -4927,7 +4927,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/windows/buydialog.cpp:267 src/gui/windows/itemamountwindow.cpp:205
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:100
 #: src/gui/windows/selldialog.cpp:103 src/gui/windows/statuswindow.cpp:829
 msgid "+"
 msgstr "+"
@@ -4939,7 +4939,7 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/windows/buydialog.cpp:270 src/gui/windows/itemamountwindow.cpp:203
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:104
+#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:102
 #: src/gui/windows/selldialog.cpp:105 src/gui/windows/statuswindow.cpp:842
 msgid "-"
 msgstr "-"
@@ -5517,7 +5517,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
 #: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/serverdialog.cpp:254
 msgid "Connect"
 msgstr "连接"
 
@@ -5848,17 +5848,17 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:67
+#: src/gui/windows/npcdialog.cpp:65
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:67
 msgid "Next"
 msgstr "下一个"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:73
+#: src/gui/windows/npcdialog.cpp:71
 msgid "Submit"
 msgstr "提交"
 
@@ -5867,9 +5867,9 @@ msgstr "提交"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:111 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:256
 #: src/gui/windows/shopwindow.cpp:91 src/gui/windows/shopwindow.cpp:98
-#: src/gui/windows/tradewindow.cpp:79
+#: src/gui/windows/tradewindow.cpp:77
 msgid "Add"
 msgstr "添加"
 
@@ -5969,53 +5969,53 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:245
 msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:262
 msgid "Load"
 msgstr "负载"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:278
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "选择你的服务器***安全模式***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:287
 msgid "Use same ip for game sub servers"
 msgstr "游戏分服务器使用相同的IP"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:530
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:536
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:541
 msgid "Preparing download"
 msgstr "准备下载"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:546
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误！"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:637
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:642
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -6073,24 +6073,24 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗？"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/skilldialog.cpp:289
 msgid "Up"
 msgstr "升级"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:406
+#: src/gui/windows/skilldialog.cpp:405
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:466
+#: src/gui/windows/skilldialog.cpp:465
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:500
+#: src/gui/windows/skilldialog.cpp:499
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
@@ -6519,53 +6519,53 @@ msgid "Save"
 msgstr "保存"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:59
+#: src/gui/windows/tradewindow.cpp:57
 msgid "Propose trade"
 msgstr "打算交易"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:61
+#: src/gui/windows/tradewindow.cpp:59
 msgid "Confirmed. Waiting..."
 msgstr "已确认。等待中……"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:63
+#: src/gui/windows/tradewindow.cpp:61
 msgid "Agree trade"
 msgstr "同意交易"
 
 #. TRANSLATORS: trade window button
-#: src/gui/windows/tradewindow.cpp:65
+#: src/gui/windows/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
 msgstr "已同意。等待中……"
 
 #. TRANSLATORS: trade window caption
-#: src/gui/windows/tradewindow.cpp:69
+#: src/gui/windows/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "交易：你"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:77 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:75 src/gui/windows/tradewindow.cpp:182
 #, c-format
 msgid "You get %s"
 msgstr "你得到%s"
 
 #. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:82
+#: src/gui/windows/tradewindow.cpp:80
 msgid "Change"
 msgstr "改变"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:126
+#: src/gui/windows/tradewindow.cpp:124
 msgid "You give:"
 msgstr "你给予："
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:387
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:473
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
@@ -6652,25 +6652,25 @@ msgstr "选择世界"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
+#: src/input/inputmanager.cpp:383 src/input/inputmanager.cpp:427
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:389
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:403
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:434
+#: src/input/inputmanager.cpp:433
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6678,7 +6678,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:447 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""